diff --git a/BankAccount/.project.orig b/BankAccount/.project.orig
deleted file mode 100644
index ef8b682ba..000000000
--- a/BankAccount/.project.orig
+++ /dev/null
@@ -1,53 +0,0 @@
-<<<<<<< HEAD
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>BankAccount</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>
-=======
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>BankAccount</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>de.ovgu.featureide.core.extensibleFeatureProjectBuilder</name>
-			<arguments>
-				<dictionary>
-					<key>build</key>
-					<value>src</value>
-				</dictionary>
-				<dictionary>
-					<key>composer</key>
-					<value>de.ovgu.featureide.composer.ahead</value>
-				</dictionary>
-				<dictionary>
-					<key>equations</key>
-					<value>configs</value>
-				</dictionary>
-				<dictionary>
-					<key>source</key>
-					<value>features</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>de.ovgu.featureide.core.featureProjectNature</nature>
-	</natures>
-</projectDescription>
->>>>>>> master
diff --git a/BankAccount/model.xml.orig b/BankAccount/model.xml.orig
deleted file mode 100644
index b9ed090b9..000000000
--- a/BankAccount/model.xml.orig
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<featureModel>
-	<properties>
-<<<<<<< HEAD
-		<graphics key="showhiddenfeatures" value="true"/>
-=======
-		<graphics key="autolayoutconstraints" value="false"/>
->>>>>>> master
-		<graphics key="legendautolayout" value="true"/>
-		<graphics key="showshortnames" value="false"/>
-		<graphics key="layout" value="horizontal"/>
-		<graphics key="showcollapsedconstraints" value="true"/>
-		<graphics key="legendhidden" value="false"/>
-		<graphics key="layoutalgorithm" value="1"/>
-	</properties>
-	<struct>
-		<and mandatory="true" name="BankAccount">
-			<feature name="DailyLimit"/>
-			<feature name="Interest"/>
-<<<<<<< HEAD
-=======
-			<feature name="Transaction"/>
->>>>>>> master
-		</and>
-	</struct>
-</featureModel>
diff --git a/BankAccountOO/.classpath.orig b/BankAccountOO/.classpath.orig
deleted file mode 100644
index 3c12f129f..000000000
--- a/BankAccountOO/.classpath.orig
+++ /dev/null
@@ -1,37 +0,0 @@
-<<<<<<< HEAD
-<<<<<<<< HEAD:BankAccountOO/.classpath
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
-========
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
-		<attributes>
-			<attribute name="module" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
->>>>>>>> master:de.tu_bs.cs.isf.cbc.statistics.ui/.classpath
-=======
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-<<<<<<<< HEAD:ElevatorCorC/.classpath
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-========
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-16">
-		<attributes>
-			<attribute name="module" value="true"/>
-		</attributes>
-	</classpathentry>
->>>>>>>> master:BankAccountOO/.classpath
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
->>>>>>> master
diff --git a/BankAccountOO/.project.orig b/BankAccountOO/.project.orig
deleted file mode 100644
index 6204d433a..000000000
--- a/BankAccountOO/.project.orig
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-<<<<<<< HEAD
-	<name>BankAccountOO</name>
-=======
-<<<<<<<< HEAD:EmailFeatureInteraction/.project
-	<name>EmailFeatureInteraction</name>
-========
-	<name>BankAccountOO</name>
->>>>>>>> master:BankAccountOO/.project
->>>>>>> master
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-<<<<<<< HEAD
-			<name>de.ovgu.featureide.core.extensibleFeatureProjectBuilder</name>
-			<arguments>
-				<dictionary>
-					<key>build</key>
-					<value>src</value>
-				</dictionary>
-				<dictionary>
-					<key>composer</key>
-					<value>de.ovgu.featureide.composer.ahead</value>
-				</dictionary>
-				<dictionary>
-					<key>equations</key>
-					<value>configs</value>
-				</dictionary>
-				<dictionary>
-					<key>source</key>
-					<value>features</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-=======
->>>>>>> master
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-<<<<<<< HEAD
-		<nature>de.ovgu.featureide.core.featureProjectNature</nature>
-=======
->>>>>>> master
-	</natures>
-</projectDescription>
diff --git a/BankAccountOO/src/.gitkeep.orig b/BankAccountOO/src/.gitkeep.orig
deleted file mode 100644
index f83932533..000000000
--- a/BankAccountOO/src/.gitkeep.orig
+++ /dev/null
@@ -1,7 +0,0 @@
-/.gitkeep
-<<<<<<< HEAD
-/Account_helper.java
-=======
-/Account.java
-/Application.java
->>>>>>> master
diff --git a/Banking-Evaluation/.project.orig b/Banking-Evaluation/.project.orig
deleted file mode 100644
index 347523d62..000000000
--- a/Banking-Evaluation/.project.orig
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>Banking-Evaluation</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>de.tu_bs.cs.isf.lattice.latticeProjectBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
-		<nature>de.tu_bs.cs.isf.lattice.LatticeNature</nature>
-	</natures>
-</projectDescription>
diff --git a/Banking-Evaluation/diagrams/Account/update.diagram.orig b/Banking-Evaluation/diagrams/Account/update.diagram.orig
deleted file mode 100644
index 4edd4b882..000000000
--- a/Banking-Evaluation/diagrams/Account/update.diagram.orig
+++ /dev/null
@@ -1,4686 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<<<<<<<< HEAD:ElevatorOO/features/Base/Elevator/continueInDirection.diagram
-<pi:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:al="http://eclipse.org/graphiti/mm/algorithms" xmlns:pi="http://eclipse.org/graphiti/mm/pictograms" visible="true" gridUnit="10" diagramTypeId="cbc" name="continueInDirection" snapToGrid="true" pictogramLinks="//@children.0/@link //@link //@children.0/@children.0/@link //@children.0/@children.1/@link //@children.0/@children.2/@link //@children.0/@children.4/@link //@children.1/@link //@children.1/@children.0/@link //@children.1/@children.2/@link //@children.1/@children.3/@link //@children.1/@children.4/@link //@children.1/@children.5/@link //@children.1/@children.6/@link //@children.1/@children.7/@link //@children.1/@children.8/@link //@children.1/@children.9/@link //@children.1/@children.10/@link //@children.1/@children.11/@link //@children.1/@children.12/@link //@children.1/@children.13/@link //@children.2/@link //@children.2/@children.0/@link //@children.2/@children.2/@link //@children.2/@children.3/@link //@children.2/@children.4/@link //@children.3/@link //@children.3/@children.1/@link //@children.3/@children.0/@link //@children.3/@children.2/@link //@children.3/@children.4/@link //@children.3/@children.5/@link //@children.3/@children.6/@link //@children.4/@link //@children.4/@children.1/@link //@children.4/@children.0/@link //@children.4/@children.2/@link //@children.4/@children.4/@link //@children.4/@children.5/@link //@children.4/@children.6/@link //@children.5/@link //@children.5/@children.0/@link //@children.5/@children.1/@link //@children.5/@children.2/@link //@children.5/@children.3/@link //@children.6/@link //@children.6/@children.1/@link //@children.6/@children.14/@link //@children.6/@children.15/@link //@children.6/@children.16/@link //@children.6/@children.20/@link //@children.6/@children.21/@link //@children.6/@children.22/@link //@children.6/@children.23/@link //@children.6/@children.27/@link //@children.7/@link //@children.7/@children.1/@link //@children.7/@children.14/@link //@children.7/@children.15/@link //@children.7/@children.16/@link //@children.7/@children.20/@link //@children.7/@children.21/@link //@children.7/@children.22/@link //@children.7/@children.23/@link //@children.7/@children.27/@link //@children.8/@link //@children.8/@children.1/@link //@children.8/@children.14/@link //@children.8/@children.15/@link //@children.8/@children.16/@link //@children.8/@children.20/@link //@children.9/@link //@children.9/@children.1/@link //@children.9/@children.14/@link //@children.9/@children.15/@link //@children.9/@children.16/@link //@children.9/@children.20/@link //@children.9/@children.21/@link //@children.9/@children.22/@link //@children.9/@children.23/@link //@children.9/@children.27/@link //@children.8/@children.21/@link //@children.8/@children.22/@link //@children.8/@children.23/@link //@children.8/@children.27/@link //@children.10/@link //@children.10/@children.0/@link //@children.10/@children.1/@link //@children.10/@children.2/@link //@children.10/@children.3/@link //@children.11/@link //@children.11/@children.0/@link //@children.11/@children.1/@link //@children.11/@children.2/@link //@children.11/@children.3/@link //@children.12/@link //@children.12/@children.0/@link //@children.12/@children.1/@link //@children.12/@children.2/@link //@children.12/@children.3/@link //@children.13/@link //@children.13/@children.0/@link //@children.13/@children.1/@link //@children.13/@children.2/@link //@children.13/@children.3/@link //@children.14/@link //@children.14/@children.0/@link //@children.14/@children.1/@link //@children.14/@children.2/@link //@children.14/@children.3/@link //@children.15/@link //@children.15/@children.0/@link //@children.15/@children.1/@link //@children.15/@children.2/@link //@children.15/@children.3/@link //@children.1/@children.14/@link" version="0.18.0">
-  <graphicsAlgorithm xsi:type="al:Rectangle" background="//@colors.1" foreground="//@colors.0" lineWidth="1" transparency="0.0" width="1000" height="1000"/>
-  <link>
-    <businessObjects href="continueInDirection.cbcmodel#/0"/>
-  </link>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.3" lineWidth="2" filled="true" transparency="0.0" width="300" height="150" x="20" y="20" cornerHeight="20" cornerWidth="20">
-========
-<pi:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:al="http://eclipse.org/graphiti/mm/algorithms" xmlns:pi="http://eclipse.org/graphiti/mm/pictograms" visible="true" gridUnit="10" diagramTypeId="cbc" name="update" snapToGrid="true" pictogramLinks="//@children.0/@link //@link //@children.0/@children.0/@link //@children.0/@children.1/@link //@children.0/@children.2/@link //@children.0/@children.4/@link //@children.1/@link //@children.1/@children.1/@link //@children.1/@children.0/@link //@children.1/@children.2/@link //@children.1/@children.4/@link //@children.1/@children.5/@link //@children.1/@children.6/@link //@children.2/@link //@children.2/@children.0/@link //@children.2/@children.1/@link //@children.2/@children.2/@link //@children.2/@children.3/@link //@children.3/@link //@children.3/@children.1/@link //@children.3/@children.0/@link //@children.3/@children.2/@link //@children.3/@children.4/@link //@children.3/@children.5/@link //@children.3/@children.6/@link //@children.4/@link //@children.4/@children.1/@link //@children.4/@children.14/@link //@children.4/@children.15/@link //@children.4/@children.16/@link //@children.4/@children.21/@link //@children.5/@link //@children.5/@children.1/@link //@children.5/@children.0/@link //@children.5/@children.2/@link //@children.5/@children.4/@link //@children.5/@children.5/@link //@children.5/@children.6/@link //@children.6/@link //@children.6/@children.1/@link //@children.6/@children.14/@link //@children.6/@children.15/@link //@children.6/@children.16/@link //@children.6/@children.21/@link //@children.7/@link //@children.7/@children.0/@link //@children.7/@children.1/@link //@children.7/@children.2/@link //@children.7/@children.3/@link //@children.8/@link //@children.8/@children.0/@link //@children.8/@children.1/@link //@children.8/@children.2/@link //@children.8/@children.3/@link //@children.9/@link //@children.9/@children.1/@link //@children.9/@children.0/@link //@children.9/@children.2/@link //@children.9/@children.4/@link //@children.9/@children.5/@link //@children.9/@children.6/@link //@children.10/@link //@children.10/@children.1/@link //@children.10/@children.14/@link //@children.10/@children.15/@link //@children.10/@children.16/@link //@children.10/@children.21/@link //@children.11/@link //@children.11/@children.0/@link //@children.11/@children.1/@link //@children.11/@children.2/@link //@children.11/@children.3/@link //@children.12/@link //@children.12/@children.0/@link //@children.12/@children.1/@link //@children.12/@children.2/@link //@children.12/@children.3/@link //@children.13/@link //@children.13/@children.1/@link //@children.13/@children.0/@link //@children.13/@children.2/@link //@children.13/@children.4/@link //@children.13/@children.5/@link //@children.13/@children.6/@link //@children.14/@link //@children.14/@children.0/@link //@children.14/@children.1/@link //@children.14/@children.2/@link //@children.14/@children.3/@link //@children.15/@link //@children.15/@children.0/@link //@children.15/@children.2/@link //@children.15/@children.3/@link //@children.15/@children.4/@link //@children.15/@children.5/@link //@children.15/@children.6/@link" version="0.18.0">
-  <graphicsAlgorithm xsi:type="al:Rectangle" background="//@colors.1" foreground="//@colors.0" lineWidth="1" transparency="0.0" width="1000" height="1000"/>
-  <link>
-    <businessObjects href="update.cbcmodel#/0"/>
-  </link>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.3" lineWidth="2" filled="true" transparency="0.0" width="300" height="150" x="330" y="100" cornerHeight="20" cornerWidth="20">
->>>>>>>> master:Banking-Evaluation/diagrams/Account/update.diagram
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-<<<<<<<< HEAD:ElevatorOO/features/Base/Elevator/continueInDirection.diagram
-      <businessObjects href="continueInDirection.cbcmodel#/0"/>
-    </link>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="90" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="{dir >= 0 &amp; dir &lt;= 1 &amp; this.currentHeading >= 0 &amp; this.currentFloorID >= 0&amp; this.env != null &amp; this.env.floors != null}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@preCondition"/>
-========
-      <businessObjects href="update.cbcmodel#/0"/>
-    </link>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" y="90" horizontalAlignment="ALIGNMENT_CENTER" value="{pre}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@preCondition"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Account/update.diagram
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="90" x="100" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementNameText"/>
-      </graphicsAlgorithm>
-      <link>
-<<<<<<<< HEAD:ElevatorOO/features/Base/Elevator/continueInDirection.diagram
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement"/>
-========
-        <businessObjects href="update.cbcmodel#/0/@statement"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Account/update.diagram
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.12"/>
-    </children>
-    <children visible="true" active="true">
-<<<<<<<< HEAD:ElevatorOO/features/Base/Elevator/continueInDirection.diagram
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="90" x="200" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(this.currentHeading,this.currentFloorID);&#xD;&#xA;((this.currentHeading = 1 &amp; this.env.isTopFloor(this.currentFloorID) = true) -> this.currentHeading = this.reverse()) &amp; ((this.currentHeading = 0 &amp; this.currentFloorID = 0) -> this.currentHeading = this.reverse())&amp; ((this.currentHeading = 1 ) -> this.currentFloorID = this.currentFloorID + 1)&amp; ((this.currentHeading != 1 ) -> this.currentFloorID = this.currentFloorID - 1)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@postCondition"/>
-========
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="200" y="90" horizontalAlignment="ALIGNMENT_CENTER" value="{post}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@postCondition"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Account/update.diagram
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="300" height="30" y="5" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Formula">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="nameText"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="280" y="10" id="de.tu_bs.cs.isf.cbc.tool.unproven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-<<<<<<<< HEAD:ElevatorOO/features/Base/Elevator/continueInDirection.diagram
-        <businessObjects href="continueInDirection.cbcmodel#/0"/>
-========
-        <businessObjects href="update.cbcmodel#/0"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Account/update.diagram
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="200" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="100" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="stHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-        <points y="40"/>
-        <points x="300" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor2Line"/>
-        <points y="60"/>
-        <points x="300" y="60"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver1Line"/>
-        <points x="100" y="40"/>
-        <points x="100" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver2Line"/>
-        <points x="200" y="40"/>
-        <points x="200" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-<<<<<<<< HEAD:ElevatorOO/features/Base/Elevator/continueInDirection.diagram
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" lineWidth="1" filled="true" transparency="0.0" width="200" height="281" x="600" y="20" cornerHeight="20" cornerWidth="20">
-========
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.3" lineWidth="2" filled="true" transparency="0.0" width="500" height="300" x="230" y="310" cornerHeight="20" cornerWidth="20">
->>>>>>>> master:Banking-Evaluation/diagrams/Account/update.diagram
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-<<<<<<<< HEAD:ElevatorOO/features/Base/Elevator/continueInDirection.diagram
-      <businessObjects href="continueInDirection.cbcmodel#/1"/>
-    </link>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Variables">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variablesName"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/1"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-        <points y="20"/>
-        <points x="200" y="20"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="20" y="260" horizontalAlignment="ALIGNMENT_CENTER" value="PRIVATE int old_currentFloorID">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="12"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@fields.0"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="20" y="240" horizontalAlignment="ALIGNMENT_CENTER" value="PUBLIC boolean[] floorButtons">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="11"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@fields.1"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="20" y="220" horizontalAlignment="ALIGNMENT_CENTER" value="PRIVATE boolean verbose">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="10"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@fields.2"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="20" y="200" horizontalAlignment="ALIGNMENT_CENTER" value="PRIVATE int currentHeading">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="9"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@fields.3"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="20" y="180" horizontalAlignment="ALIGNMENT_CENTER" value="PRIVATE int currentFloorID">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="8"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@fields.4"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="20" y="160" horizontalAlignment="ALIGNMENT_CENTER" value="PRIVATE int doors">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="7"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@fields.5"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="20" y="140" horizontalAlignment="ALIGNMENT_CENTER" value="PRIVATE Environment env">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="6"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@fields.6"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="20" y="120" horizontalAlignment="ALIGNMENT_CENTER" value="PRIVATE ArrayList persons">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="5"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@fields.7"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="20" y="100" horizontalAlignment="ALIGNMENT_CENTER" value="PRIVATE boolean blocked">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="4"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@fields.8"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="20" y="80" horizontalAlignment="ALIGNMENT_CENTER" value="PRIVATE boolean old_contains">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="3"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@fields.9"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="20" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="PRIVATE int old_weight">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="2"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@fields.10"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="20" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="PARAM int dir">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@methods.2/@parameters.0"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="20" y="20" horizontalAlignment="ALIGNMENT_CENTER" value="PRIVATE int weight">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@fields.11"/>
-      </link>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" lineWidth="1" filled="true" transparency="0.0" width="200" height="100" x="360" y="30" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="continueInDirection.cbcmodel#/2"/>
-    </link>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="25" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Global Conditions">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="globalConditionsName"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/2"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-        <points y="25"/>
-        <points x="200" y="25"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="200" height="25" y="25" horizontalAlignment="ALIGNMENT_CENTER" value="this.env.floors.length > 0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="globalcondition"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/2/@conditions.0"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="200" height="25" y="50" horizontalAlignment="ALIGNMENT_CENTER" value="this.env != null">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="globalcondition"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/2/@conditions.1"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="200" height="25" y="75" horizontalAlignment="ALIGNMENT_CENTER" value="this.env.floors != null">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="globalcondition"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="2"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/2/@conditions.2"/>
-      </link>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.3" lineWidth="2" filled="true" transparency="0.0" width="500" height="300" x="80" y="220" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.12"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="100" y="200" horizontalAlignment="ALIGNMENT_CENTER" value="statement1">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement1NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@firstStatement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.11"/>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="100" x="166" y="200" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(this.currentHeading);&#xD;&#xA;dir >= 0 &amp; dir &lt;= 1 &amp; this.currentHeading >= 0 &amp; this.currentFloorID >= 0&amp; this.env != null &amp; this.env.floors != null &amp; this.currentHeading = dir}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="conditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@intermediateCondition"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="100" x="332" y="200" horizontalAlignment="ALIGNMENT_CENTER" value="statement2">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement2NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.10"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="500" height="60" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Composition">
-========
-      <businessObjects href="update.cbcmodel#/0/@statement/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.0"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="110" y="190" horizontalAlignment="ALIGNMENT_CENTER" value="statement1">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement1NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@firstStatement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.1"/>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="73" x="166" y="226" horizontalAlignment="ALIGNMENT_CENTER" value="{intermediateCond}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="conditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@intermediateCondition"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="110" x="332" y="190" horizontalAlignment="ALIGNMENT_CENTER" value="statement2">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement2NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.2"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="500" height="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Composition">
->>>>>>>> master:Banking-Evaluation/diagrams/Account/update.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="nameText"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-<<<<<<<< HEAD:ElevatorOO/features/Base/Elevator/continueInDirection.diagram
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="100" y="80" horizontalAlignment="ALIGNMENT_CENTER" value="{dir >= 0 &amp; dir &lt;= 1 &amp; this.currentHeading >= 0 &amp; this.currentFloorID >= 0&amp; this.env != null &amp; this.env.floors != null}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="pre1NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@firstStatement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="100" x="250" y="80" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(this.currentHeading,this.currentFloorID);&#xD;&#xA;((this.currentHeading = 1 &amp; this.env.isTopFloor(this.currentFloorID) = true) -> this.currentHeading = this.reverse()) &amp; ((this.currentHeading = 0 &amp; this.currentFloorID = 0) -> this.currentHeading = this.reverse())&amp; ((this.currentHeading = 1 ) -> this.currentFloorID = this.currentFloorID + 1)&amp; ((this.currentHeading != 1 ) -> this.currentFloorID = this.currentFloorID - 1)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="post2NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@postCondition"/>
-========
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="73" y="96" horizontalAlignment="ALIGNMENT_CENTER" value="{pre}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="pre1NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@firstStatement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="73" x="250" y="96" horizontalAlignment="ALIGNMENT_CENTER" value="{post}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="post2NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@postCondition"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Account/update.diagram
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="480" y="10" id="de.tu_bs.cs.isf.cbc.tool.unproven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-<<<<<<<< HEAD:ElevatorOO/features/Base/Elevator/continueInDirection.diagram
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement"/>
-========
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" x="250" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="166" height="20" y="170" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement 1">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement1Header"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="166" height="20" x="332" y="170" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement 2">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement2Header"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="166" height="20" x="166" y="170" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="intermediate condition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="intermediateCondHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-        <points y="40"/>
-        <points x="500" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor2Line"/>
-        <points y="60"/>
-        <points x="500" y="60"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor3Line"/>
-        <points y="170"/>
-        <points x="500" y="170"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor4Line"/>
-        <points y="190"/>
-        <points x="500" y="190"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver1Line"/>
-        <points x="250" y="40"/>
-        <points x="250" y="170"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver2Line"/>
-        <points x="166" y="170"/>
-        <points x="166" y="300"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver3Line"/>
-        <points x="332" y="170"/>
-        <points x="332" y="300"/>
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.3" lineWidth="2" filled="true" transparency="0.0" width="300" height="100" x="31" y="680" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.1"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="100" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="newWithdraw = a.withdraw;">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{pre}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="200" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{intermediateCond}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="280" y="10" id="de.tu_bs.cs.isf.cbc.tool.unproven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="100" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="200" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerSeparater"/>
-        <points y="40"/>
-        <points x="300" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preSep"/>
-        <points x="200"/>
-        <points x="200" y="100"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postSep"/>
-        <points x="100"/>
-        <points x="100" y="100"/>
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.3" lineWidth="2" filled="true" transparency="0.0" width="500" height="300" x="820" y="620" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.2"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="110" y="190" horizontalAlignment="ALIGNMENT_CENTER" value="statement1">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement1NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.3"/>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="73" x="166" y="226" horizontalAlignment="ALIGNMENT_CENTER" value="{intermediateCond}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="conditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@intermediateCondition"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="110" x="332" y="190" horizontalAlignment="ALIGNMENT_CENTER" value="statement2">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement2NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.8"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="500" height="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Composition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="nameText"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="73" y="96" horizontalAlignment="ALIGNMENT_CENTER" value="{intermediateCond}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="pre1NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="73" x="250" y="96" horizontalAlignment="ALIGNMENT_CENTER" value="{post}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="post2NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="480" y="10" id="de.tu_bs.cs.isf.cbc.tool.unproven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" x="250" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="166" height="20" y="170" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement 1">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement1Header"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="166" height="20" x="332" y="170" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement 2">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement2Header"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="166" height="20" x="166" y="170" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="intermediate condition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="intermediateCondHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-        <points y="40"/>
-        <points x="500" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor2Line"/>
-        <points y="60"/>
-        <points x="500" y="60"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor3Line"/>
-        <points y="170"/>
-        <points x="500" y="170"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor4Line"/>
-        <points y="190"/>
-        <points x="500" y="190"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver1Line"/>
-        <points x="250" y="40"/>
-        <points x="250" y="170"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver2Line"/>
-        <points x="166" y="170"/>
-        <points x="166" y="300"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver3Line"/>
-        <points x="332" y="170"/>
-        <points x="332" y="300"/>
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.3" lineWidth="2" filled="true" transparency="0.0" width="250" height="300" x="450" y="980" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.3"/>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="40" horizontalAlignment="ALIGNMENT_CENTER" value="SelectionStatement IF..FI">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="nameText"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="230" y="10" id="de.tu_bs.cs.isf.cbc.tool.unproven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="guards">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="guardHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" y="105" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" y="170" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statements">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" y="235" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-        <points y="40"/>
-        <points x="250" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor2Line"/>
-        <points y="60"/>
-        <points x="250" y="60"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor3Line"/>
-        <points y="105"/>
-        <points x="250" y="105"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor4Line"/>
-        <points y="125"/>
-        <points x="250" y="125"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor5Line"/>
-        <points y="170"/>
-        <points x="250" y="170"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor6Line"/>
-        <points y="190"/>
-        <points x="250" y="190"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor7Line"/>
-        <points y="235"/>
-        <points x="250" y="235"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor8Line"/>
-        <points y="255"/>
-        <points x="250" y="255"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="45" y="190" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementSelNameText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.4"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="45" y="125" horizontalAlignment="ALIGNMENT_CENTER" value="{(intermediateCond) &amp; (x &lt; 0)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="45" y="255" horizontalAlignment="ALIGNMENT_CENTER" value="{intermediateCond}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver1Line"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver2Line"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver3Line"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver4Line"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="45" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="x &lt; 0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="conditionSelText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@guards.0"/>
-      </link>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.3" lineWidth="2" filled="true" transparency="0.0" width="500" height="300" x="250" y="1360" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.4"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="100" y="200" horizontalAlignment="ALIGNMENT_CENTER" value="statement1">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement1NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement/@firstStatement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.5"/>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="100" x="166" y="200" horizontalAlignment="ALIGNMENT_CENTER" value="{intermediateCond}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="conditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement/@intermediateCondition"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="100" x="332" y="200" horizontalAlignment="ALIGNMENT_CENTER" value="statement2">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement2NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement/@secondStatement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.6"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="500" height="60" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Composition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="nameText"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="100" y="80" horizontalAlignment="ALIGNMENT_CENTER" value="{(intermediateCond) &amp; (x &lt; 0)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="pre1NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement/@firstStatement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="100" x="250" y="80" horizontalAlignment="ALIGNMENT_CENTER" value="{intermediateCond}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="post2NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement/@secondStatement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="480" y="10" id="de.tu_bs.cs.isf.cbc.tool.unproven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Account/update.diagram
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" y="60" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" x="250" y="60" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="166" height="20" y="180" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement 1">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement1Header"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="166" height="20" x="332" y="180" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement 2">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement2Header"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="166" height="20" x="166" y="180" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="intermediate condition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="intermediateCondHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-        <points y="60"/>
-        <points x="500" y="60"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor2Line"/>
-        <points y="80"/>
-        <points x="500" y="80"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor3Line"/>
-        <points y="180"/>
-        <points x="500" y="180"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor4Line"/>
-        <points y="200"/>
-        <points x="500" y="200"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver1Line"/>
-        <points x="250" y="60"/>
-        <points x="250" y="180"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver2Line"/>
-        <points x="166" y="180"/>
-        <points x="166" y="300"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver3Line"/>
-        <points x="332" y="180"/>
-        <points x="332" y="300"/>
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-<<<<<<<< HEAD:ElevatorOO/features/Base/Elevator/continueInDirection.diagram
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.3" lineWidth="2" filled="true" transparency="0.0" width="500" height="300" x="550" y="570" cornerHeight="20" cornerWidth="20">
-========
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.3" lineWidth="2" filled="true" transparency="0.0" width="250" height="300" x="620" y="1720" cornerHeight="20" cornerWidth="20">
->>>>>>>> master:Banking-Evaluation/diagrams/Account/update.diagram
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-<<<<<<<< HEAD:ElevatorOO/features/Base/Elevator/continueInDirection.diagram
-      <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.10"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="100" y="200" horizontalAlignment="ALIGNMENT_CENTER" value="statement1">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement1NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.9"/>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="100" x="166" y="200" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(this.currentHeading);&#xD;&#xA;((this.currentHeading = 1 &amp; this.env.isTopFloor(this.currentFloorID) = TRUE) -> this.currentHeading = 0) &amp; ((this.currentHeading = 0 &amp; this.currentFloorID = 0) -> this.currentHeading = 1)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="conditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@intermediateCondition"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="100" x="332" y="200" horizontalAlignment="ALIGNMENT_CENTER" value="statement2">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement2NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.8"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="500" height="60" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Composition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="nameText"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="100" y="80" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(this.currentHeading);&#xD;&#xA;dir >= 0 &amp; dir &lt;= 1 &amp; this.currentHeading >= 0 &amp; this.currentFloorID >= 0&amp; this.env != null &amp; this.env.floors != null &amp; this.currentHeading = dir}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="pre1NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="100" x="250" y="80" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(this.currentHeading,this.currentFloorID);&#xD;&#xA;((this.currentHeading = 1 &amp; this.env.isTopFloor(this.currentFloorID) = true) -> this.currentHeading = this.reverse()) &amp; ((this.currentHeading = 0 &amp; this.currentFloorID = 0) -> this.currentHeading = this.reverse())&amp; ((this.currentHeading = 1 ) -> this.currentFloorID = this.currentFloorID + 1)&amp; ((this.currentHeading != 1 ) -> this.currentFloorID = this.currentFloorID - 1)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="post2NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="480" y="10" id="de.tu_bs.cs.isf.cbc.tool.unproven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" y="60" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" x="250" y="60" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="166" height="20" y="180" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement 1">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement1Header"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="166" height="20" x="332" y="180" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement 2">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement2Header"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="166" height="20" x="166" y="180" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="intermediate condition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="intermediateCondHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-        <points y="60"/>
-        <points x="500" y="60"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor2Line"/>
-        <points y="80"/>
-        <points x="500" y="80"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor3Line"/>
-        <points y="180"/>
-        <points x="500" y="180"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor4Line"/>
-        <points y="200"/>
-        <points x="500" y="200"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver1Line"/>
-        <points x="250" y="60"/>
-        <points x="250" y="180"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver2Line"/>
-        <points x="166" y="180"/>
-        <points x="166" y="300"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver3Line"/>
-        <points x="332" y="180"/>
-        <points x="332" y="300"/>
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.3" lineWidth="2" filled="true" transparency="0.0" width="300" height="100" x="50" y="590" cornerHeight="20" cornerWidth="20">
-========
-      <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement/@secondStatement/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.6"/>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="40" horizontalAlignment="ALIGNMENT_CENTER" value="SelectionStatement IF..FI">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="nameText"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="230" y="10" id="de.tu_bs.cs.isf.cbc.tool.unproven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement/@secondStatement/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="guards">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="guardHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" y="105" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" y="170" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statements">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" y="235" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-        <points y="40"/>
-        <points x="250" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor2Line"/>
-        <points y="60"/>
-        <points x="250" y="60"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor3Line"/>
-        <points y="105"/>
-        <points x="250" y="105"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor4Line"/>
-        <points y="125"/>
-        <points x="250" y="125"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor5Line"/>
-        <points y="170"/>
-        <points x="250" y="170"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor6Line"/>
-        <points y="190"/>
-        <points x="250" y="190"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor7Line"/>
-        <points y="235"/>
-        <points x="250" y="235"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor8Line"/>
-        <points y="255"/>
-        <points x="250" y="255"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="45" y="190" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementSelNameText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement/@secondStatement/@refinement/@commands.0"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.7"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="45" y="125" horizontalAlignment="ALIGNMENT_CENTER" value="{(intermediateCond) &amp; (newWithdraw &lt; a.DAILY_LIMIT)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement/@secondStatement/@refinement/@commands.0/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="45" y="255" horizontalAlignment="ALIGNMENT_CENTER" value="{intermediateCond}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement/@secondStatement/@refinement/@commands.0/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver1Line"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver2Line"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver3Line"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver4Line"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="45" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="newWithdraw &lt; a.DAILY_LIMIT">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="conditionSelText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement/@secondStatement/@refinement/@guards.0"/>
-      </link>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.3" lineWidth="2" filled="true" transparency="0.0" width="300" height="100" x="70" y="1740" cornerHeight="20" cornerWidth="20">
->>>>>>>> master:Banking-Evaluation/diagrams/Account/update.diagram
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-<<<<<<<< HEAD:ElevatorOO/features/Base/Elevator/continueInDirection.diagram
-      <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.11"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="100" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="this.currentHeading = dir;">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement"/>
-========
-      <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement/@firstStatement/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.5"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="100" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="newWithdraw  =newWithdraw + x;">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement/@firstStatement/@refinement"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Account/update.diagram
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-<<<<<<<< HEAD:ElevatorOO/features/Base/Elevator/continueInDirection.diagram
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{dir >= 0 &amp; dir &lt;= 1 &amp; this.currentHeading >= 0 &amp; this.currentFloorID >= 0&amp; this.env != null &amp; this.env.floors != null}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="200" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(this.currentHeading);&#xD;&#xA;dir >= 0 &amp; dir &lt;= 1 &amp; this.currentHeading >= 0 &amp; this.currentFloorID >= 0&amp; this.env != null &amp; this.env.floors != null &amp; this.currentHeading = dir}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement/@postCondition"/>
-========
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{(intermediateCond) &amp; (x &lt; 0)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement/@firstStatement/@refinement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="200" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{intermediateCond}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement/@firstStatement/@refinement/@postCondition"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Account/update.diagram
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="280" y="10" id="de.tu_bs.cs.isf.cbc.tool.unproven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-<<<<<<<< HEAD:ElevatorOO/features/Base/Elevator/continueInDirection.diagram
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement"/>
-========
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement/@firstStatement/@refinement"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Account/update.diagram
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="100" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="200" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerSeparater"/>
-        <points y="40"/>
-        <points x="300" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preSep"/>
-        <points x="200"/>
-        <points x="200" y="100"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postSep"/>
-        <points x="100"/>
-        <points x="100" y="100"/>
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-<<<<<<<< HEAD:ElevatorOO/features/Base/Elevator/continueInDirection.diagram
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.3" lineWidth="2" filled="true" transparency="0.0" width="200" height="300" x="470" y="940" cornerHeight="20" cornerWidth="20">
-========
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.3" lineWidth="2" filled="true" transparency="0.0" width="300" height="100" x="470" y="2080" cornerHeight="20" cornerWidth="20">
->>>>>>>> master:Banking-Evaluation/diagrams/Account/update.diagram
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-<<<<<<<< HEAD:ElevatorOO/features/Base/Elevator/continueInDirection.diagram
-      <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.9"/>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="200" height="40" horizontalAlignment="ALIGNMENT_CENTER" value="SelectionStatement IF..FI">
-========
-      <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement/@secondStatement/@refinement/@commands.0/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.7"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="100" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="result = false;">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement/@secondStatement/@refinement/@commands.0/@refinement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{(intermediateCond) &amp; (newWithdraw &lt; a.DAILY_LIMIT)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement/@secondStatement/@refinement/@commands.0/@refinement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="200" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{intermediateCond}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement/@secondStatement/@refinement/@commands.0/@refinement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="280" y="10" id="de.tu_bs.cs.isf.cbc.tool.unproven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement/@secondStatement/@refinement/@commands.0/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="100" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="200" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerSeparater"/>
-        <points y="40"/>
-        <points x="300" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preSep"/>
-        <points x="200"/>
-        <points x="200" y="100"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postSep"/>
-        <points x="100"/>
-        <points x="100" y="100"/>
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.3" lineWidth="2" filled="true" transparency="0.0" width="500" height="300" x="1290" y="1030" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.8"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="110" y="190" horizontalAlignment="ALIGNMENT_CENTER" value="statement1">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement1NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@firstStatement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.11"/>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="73" x="166" y="226" horizontalAlignment="ALIGNMENT_CENTER" value="{intermediateCond}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="conditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@intermediateCondition"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="110" x="332" y="190" horizontalAlignment="ALIGNMENT_CENTER" value="statement2">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement2NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@secondStatement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.9"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="500" height="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Composition">
->>>>>>>> master:Banking-Evaluation/diagrams/Account/update.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="nameText"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-<<<<<<<< HEAD:ElevatorOO/features/Base/Elevator/continueInDirection.diagram
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="180" y="10" id="de.tu_bs.cs.isf.cbc.tool.unproven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="20" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="guards">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="guardHeader"/>
-========
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="73" y="96" horizontalAlignment="ALIGNMENT_CENTER" value="{intermediateCond}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="pre1NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@firstStatement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="73" x="250" y="96" horizontalAlignment="ALIGNMENT_CENTER" value="{post}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="post2NameText"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Account/update.diagram
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@secondStatement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-<<<<<<<< HEAD:ElevatorOO/features/Base/Elevator/continueInDirection.diagram
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="20" y="105" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-========
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="480" y="10" id="de.tu_bs.cs.isf.cbc.tool.unproven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
->>>>>>>> master:Banking-Evaluation/diagrams/Account/update.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-<<<<<<<< HEAD:ElevatorOO/features/Base/Elevator/continueInDirection.diagram
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="20" y="170" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statements">
-========
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" x="250" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="166" height="20" y="170" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement 1">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement1Header"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="166" height="20" x="332" y="170" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement 2">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement2Header"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="166" height="20" x="166" y="170" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="intermediate condition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="intermediateCondHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-        <points y="40"/>
-        <points x="500" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor2Line"/>
-        <points y="60"/>
-        <points x="500" y="60"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor3Line"/>
-        <points y="170"/>
-        <points x="500" y="170"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor4Line"/>
-        <points y="190"/>
-        <points x="500" y="190"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver1Line"/>
-        <points x="250" y="40"/>
-        <points x="250" y="170"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver2Line"/>
-        <points x="166" y="170"/>
-        <points x="166" y="300"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver3Line"/>
-        <points x="332" y="170"/>
-        <points x="332" y="300"/>
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.3" lineWidth="2" filled="true" transparency="0.0" width="250" height="300" x="1360" y="1659" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@secondStatement/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.12"/>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="40" horizontalAlignment="ALIGNMENT_CENTER" value="SelectionStatement IF..FI">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="nameText"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="230" y="10" id="de.tu_bs.cs.isf.cbc.tool.unproven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@secondStatement/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="guards">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="guardHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" y="105" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" y="170" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statements">
->>>>>>>> master:Banking-Evaluation/diagrams/Account/update.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-<<<<<<<< HEAD:ElevatorOO/features/Base/Elevator/continueInDirection.diagram
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="20" y="235" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-========
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" y="235" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
->>>>>>>> master:Banking-Evaluation/diagrams/Account/update.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-        <points y="40"/>
-<<<<<<<< HEAD:ElevatorOO/features/Base/Elevator/continueInDirection.diagram
-        <points x="200" y="40"/>
-========
-        <points x="250" y="40"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Account/update.diagram
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor2Line"/>
-        <points y="60"/>
-<<<<<<<< HEAD:ElevatorOO/features/Base/Elevator/continueInDirection.diagram
-        <points x="200" y="60"/>
-========
-        <points x="250" y="60"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Account/update.diagram
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor3Line"/>
-        <points y="105"/>
-<<<<<<<< HEAD:ElevatorOO/features/Base/Elevator/continueInDirection.diagram
-        <points x="200" y="105"/>
-========
-        <points x="250" y="105"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Account/update.diagram
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor4Line"/>
-        <points y="125"/>
-<<<<<<<< HEAD:ElevatorOO/features/Base/Elevator/continueInDirection.diagram
-        <points x="200" y="125"/>
-========
-        <points x="250" y="125"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Account/update.diagram
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor5Line"/>
-        <points y="170"/>
-<<<<<<<< HEAD:ElevatorOO/features/Base/Elevator/continueInDirection.diagram
-        <points x="200" y="170"/>
-========
-        <points x="250" y="170"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Account/update.diagram
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor6Line"/>
-        <points y="190"/>
-<<<<<<<< HEAD:ElevatorOO/features/Base/Elevator/continueInDirection.diagram
-        <points x="200" y="190"/>
-========
-        <points x="250" y="190"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Account/update.diagram
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor7Line"/>
-        <points y="235"/>
-<<<<<<<< HEAD:ElevatorOO/features/Base/Elevator/continueInDirection.diagram
-        <points x="200" y="235"/>
-========
-        <points x="250" y="235"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Account/update.diagram
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor8Line"/>
-        <points y="255"/>
-<<<<<<<< HEAD:ElevatorOO/features/Base/Elevator/continueInDirection.diagram
-        <points x="200" y="255"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="45" y="190" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
-========
-        <points x="250" y="255"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="45" y="190" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
->>>>>>>> master:Banking-Evaluation/diagrams/Account/update.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementSelNameText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-<<<<<<<< HEAD:ElevatorOO/features/Base/Elevator/continueInDirection.diagram
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0"/>
-========
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@secondStatement/@refinement/@commands.0"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Account/update.diagram
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.4"/>
-    </children>
-    <children visible="true">
-<<<<<<<< HEAD:ElevatorOO/features/Base/Elevator/continueInDirection.diagram
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="45" y="125" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(this.currentHeading);(dir >= 0 &amp; dir &lt;= 1 &amp; this.currentHeading >= 0 &amp; this.currentFloorID >= 0&amp; this.env != null &amp; this.env.floors != null &amp; this.currentHeading = dir) &amp; (this.currentHeading == 1)}">
-========
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="45" y="125" horizontalAlignment="ALIGNMENT_CENTER" value="{(intermediateCond) &amp; (tmp == true)}">
->>>>>>>> master:Banking-Evaluation/diagrams/Account/update.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-<<<<<<<< HEAD:ElevatorOO/features/Base/Elevator/continueInDirection.diagram
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="200" height="45" y="255" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(this.currentHeading);&#xD;&#xA;((this.currentHeading = 1 &amp; this.env.isTopFloor(this.currentFloorID) = TRUE) -> this.currentHeading = 0) &amp; ((this.currentHeading = 0 &amp; this.currentFloorID = 0) -> this.currentHeading = 1)}">
-========
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@secondStatement/@refinement/@commands.0/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="45" y="255" horizontalAlignment="ALIGNMENT_CENTER" value="{intermediateCond}">
->>>>>>>> master:Banking-Evaluation/diagrams/Account/update.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-<<<<<<<< HEAD:ElevatorOO/features/Base/Elevator/continueInDirection.diagram
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@postCondition"/>
-========
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@secondStatement/@refinement/@commands.0/@postCondition"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Account/update.diagram
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver1Line"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver2Line"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver3Line"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-    </children>
-<<<<<<<< HEAD:ElevatorOO/features/Base/Elevator/continueInDirection.diagram
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="45" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="this.currentHeading == 1">
-========
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver4Line"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="45" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="tmp == true">
->>>>>>>> master:Banking-Evaluation/diagrams/Account/update.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="conditionSelText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-<<<<<<<< HEAD:ElevatorOO/features/Base/Elevator/continueInDirection.diagram
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@guards.0"/>
-========
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@secondStatement/@refinement/@guards.0"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Account/update.diagram
-      </link>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.3" lineWidth="2" filled="true" transparency="0.0" width="300" height="100" x="1351" y="2000" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@secondStatement/@refinement/@commands.0/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.10"/>
-    <children visible="true" active="true">
-<<<<<<<< HEAD:ElevatorOO/features/Base/Elevator/continueInDirection.diagram
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="45" x="100" y="190" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementSelNameText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.1"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.5"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="45" x="100" y="125" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(this.currentHeading);(dir >= 0 &amp; dir &lt;= 1 &amp; this.currentHeading >= 0 &amp; this.currentFloorID >= 0&amp; this.env != null &amp; this.env.floors != null &amp; this.currentHeading = dir) &amp; (this.currentHeading != 0)}">
-========
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="100" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="result = false;">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@secondStatement/@refinement/@commands.0/@refinement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{(intermediateCond) &amp; (tmp == true)}">
->>>>>>>> master:Banking-Evaluation/diagrams/Account/update.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-      </graphicsAlgorithm>
-      <link>
-<<<<<<<< HEAD:ElevatorOO/features/Base/Elevator/continueInDirection.diagram
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.1/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(this.currentHeading);&#xD;&#xA;((this.currentHeading = 1 &amp; this.env.isTopFloor(this.currentFloorID) = TRUE) -> this.currentHeading = 0) &amp; ((this.currentHeading = 0 &amp; this.currentFloorID = 0) -> this.currentHeading = 1)}">
-========
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@secondStatement/@refinement/@commands.0/@refinement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="200" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{intermediateCond}">
->>>>>>>> master:Banking-Evaluation/diagrams/Account/update.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-      </graphicsAlgorithm>
-      <link>
-<<<<<<<< HEAD:ElevatorOO/features/Base/Elevator/continueInDirection.diagram
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.1/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver1Line"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-        <points x="100" y="60"/>
-        <points x="100" y="105"/>
-========
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@secondStatement/@refinement/@commands.0/@refinement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="280" y="10" id="de.tu_bs.cs.isf.cbc.tool.unproven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@secondStatement/@refinement/@commands.0/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="100" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="200" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Account/update.diagram
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-<<<<<<<< HEAD:ElevatorOO/features/Base/Elevator/continueInDirection.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver2Line"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-        <points x="100" y="125"/>
-        <points x="100" y="170"/>
-========
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerSeparater"/>
-        <points y="40"/>
-        <points x="300" y="40"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Account/update.diagram
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-<<<<<<<< HEAD:ElevatorOO/features/Base/Elevator/continueInDirection.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver3Line"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-        <points x="100" y="190"/>
-        <points x="100" y="235"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="45" x="100" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="this.currentHeading != 0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="conditionSelText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@guards.1"/>
-      </link>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.3" lineWidth="2" filled="true" transparency="0.0" width="200" height="300" x="900" y="940" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.8"/>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="200" height="40" horizontalAlignment="ALIGNMENT_CENTER" value="SelectionStatement IF..FI">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="nameText"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="180" y="10" id="de.tu_bs.cs.isf.cbc.tool.unproven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="20" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="guards">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="guardHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="20" y="105" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="20" y="170" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statements">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="20" y="235" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-        <points y="40"/>
-        <points x="200" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor2Line"/>
-        <points y="60"/>
-        <points x="200" y="60"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor3Line"/>
-        <points y="105"/>
-        <points x="200" y="105"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor4Line"/>
-        <points y="125"/>
-        <points x="200" y="125"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor5Line"/>
-        <points y="170"/>
-        <points x="200" y="170"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor6Line"/>
-        <points y="190"/>
-        <points x="200" y="190"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor7Line"/>
-        <points y="235"/>
-        <points x="200" y="235"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor8Line"/>
-        <points y="255"/>
-        <points x="200" y="255"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="45" y="190" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementSelNameText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@commands.0"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.6"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="45" y="125" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(this.currentHeading);(((this.currentHeading = 1 &amp; this.env.isTopFloor(this.currentFloorID) = TRUE) -> this.currentHeading = 0) &amp; ((this.currentHeading = 0 &amp; this.currentFloorID = 0) -> this.currentHeading = 1)) &amp; (this.currentHeading == 1)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@commands.0/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="200" height="45" y="255" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(this.currentHeading,this.currentFloorID);&#xD;&#xA;((this.currentHeading = 1 &amp; this.env.isTopFloor(this.currentFloorID) = true) -> this.currentHeading = this.reverse()) &amp; ((this.currentHeading = 0 &amp; this.currentFloorID = 0) -> this.currentHeading = this.reverse())&amp; ((this.currentHeading = 1 ) -> this.currentFloorID = this.currentFloorID + 1)&amp; ((this.currentHeading != 1 ) -> this.currentFloorID = this.currentFloorID - 1)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@commands.0/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver1Line"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver2Line"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver3Line"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="45" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="this.currentHeading == 1">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="conditionSelText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@guards.0"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="45" x="100" y="190" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementSelNameText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@commands.1"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.7"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="45" x="100" y="125" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(this.currentHeading);(((this.currentHeading = 1 &amp; this.env.isTopFloor(this.currentFloorID) = TRUE) -> this.currentHeading = 0) &amp; ((this.currentHeading = 0 &amp; this.currentFloorID = 0) -> this.currentHeading = 1)) &amp; (this.currentHeading != 1)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@commands.1/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(this.currentHeading,this.currentFloorID);&#xD;&#xA;((this.currentHeading = 1 &amp; this.env.isTopFloor(this.currentFloorID) = true) -> this.currentHeading = this.reverse()) &amp; ((this.currentHeading = 0 &amp; this.currentFloorID = 0) -> this.currentHeading = this.reverse())&amp; ((this.currentHeading = 1 ) -> this.currentFloorID = this.currentFloorID + 1)&amp; ((this.currentHeading != 1 ) -> this.currentFloorID = this.currentFloorID - 1)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@commands.1/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver1Line"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-        <points x="100" y="60"/>
-        <points x="100" y="105"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver2Line"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-        <points x="100" y="125"/>
-        <points x="100" y="170"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver3Line"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-        <points x="100" y="190"/>
-        <points x="100" y="235"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="45" x="100" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="this.currentHeading != 1">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="conditionSelText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@guards.1"/>
-      </link>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.3" lineWidth="2" filled="true" transparency="0.0" width="200" height="300" x="170" y="1360" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.4"/>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="200" height="40" horizontalAlignment="ALIGNMENT_CENTER" value="SelectionStatement IF..FI">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="nameText"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="180" y="10" id="de.tu_bs.cs.isf.cbc.tool.unproven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="20" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="guards">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="guardHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="20" y="105" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="20" y="170" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statements">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="20" y="235" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-        <points y="40"/>
-        <points x="200" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor2Line"/>
-        <points y="60"/>
-        <points x="200" y="60"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor3Line"/>
-        <points y="105"/>
-        <points x="200" y="105"/>
-      </graphicsAlgorithm>
-========
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preSep"/>
-        <points x="200"/>
-        <points x="200" y="100"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postSep"/>
-        <points x="100"/>
-        <points x="100" y="100"/>
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.3" lineWidth="2" filled="true" transparency="0.0" width="300" height="100" x="1650" y="1460" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.9"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="100" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="a.withdraw = newWithdraw;">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{intermediateCond}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="200" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{post}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="280" y="10" id="de.tu_bs.cs.isf.cbc.tool.unproven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="100" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="200" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerSeparater"/>
-        <points y="40"/>
-        <points x="300" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preSep"/>
-        <points x="200"/>
-        <points x="200" y="100"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postSep"/>
-        <points x="100"/>
-        <points x="100" y="100"/>
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.3" lineWidth="2" filled="true" transparency="0.0" width="500" height="300" x="840" y="1400" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.11"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="100" y="200" horizontalAlignment="ALIGNMENT_CENTER" value="statement1">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement1NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@firstStatement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.13"/>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="100" x="166" y="200" horizontalAlignment="ALIGNMENT_CENTER" value="{intermediateCond}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="conditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@intermediateCondition"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="100" x="332" y="200" horizontalAlignment="ALIGNMENT_CENTER" value="statement2">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement2NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@secondStatement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.12"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="500" height="60" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Composition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="nameText"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="100" y="80" horizontalAlignment="ALIGNMENT_CENTER" value="{intermediateCond}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="pre1NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@firstStatement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="100" x="250" y="80" horizontalAlignment="ALIGNMENT_CENTER" value="{intermediateCond}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="post2NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@secondStatement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="480" y="10" id="de.tu_bs.cs.isf.cbc.tool.unproven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" y="60" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" x="250" y="60" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="166" height="20" y="180" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement 1">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement1Header"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="166" height="20" x="332" y="180" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement 2">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement2Header"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="166" height="20" x="166" y="180" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="intermediate condition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="intermediateCondHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-        <points y="60"/>
-        <points x="500" y="60"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor2Line"/>
-        <points y="80"/>
-        <points x="500" y="80"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor3Line"/>
-        <points y="180"/>
-        <points x="500" y="180"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor4Line"/>
-        <points y="200"/>
-        <points x="500" y="200"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver1Line"/>
-        <points x="250" y="60"/>
-        <points x="250" y="180"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver2Line"/>
-        <points x="166" y="180"/>
-        <points x="166" y="300"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver3Line"/>
-        <points x="332" y="180"/>
-        <points x="332" y="300"/>
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.3" lineWidth="2" filled="true" transparency="0.0" width="300" height="100" x="930" y="1810" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@firstStatement/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.13"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="100" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="tmp = a.updateBalance(x);">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@firstStatement/@refinement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{intermediateCond}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@firstStatement/@refinement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="200" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{intermediateCond}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@firstStatement/@refinement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="280" y="10" id="de.tu_bs.cs.isf.cbc.tool.unproven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@firstStatement/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="100" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="200" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerSeparater"/>
-        <points y="40"/>
-        <points x="300" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preSep"/>
-        <points x="200"/>
-        <points x="200" y="100"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postSep"/>
-        <points x="100"/>
-        <points x="100" y="100"/>
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" lineWidth="1" filled="true" transparency="0.0" width="400" height="211" x="920" y="260" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="update.cbcmodel#/1"/>
-    </link>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="400" height="35" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Variables">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variablesName"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/1"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-        <points y="35"/>
-        <points x="400" y="35"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="400" height="35" y="175" horizontalAlignment="ALIGNMENT_CENTER" value="LOCAL Account a">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="4"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/1/@variables.0"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="400" height="35" y="140" horizontalAlignment="ALIGNMENT_CENTER" value="LOCAL boolean tmp">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="3"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/1/@variables.1"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="400" height="35" y="105" horizontalAlignment="ALIGNMENT_CENTER" value="PARAM int x">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="2"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/1/@variables.2"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="400" height="35" y="70" horizontalAlignment="ALIGNMENT_CENTER" value="LOCAL boolean result">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/1/@variables.3"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="400" height="35" y="35" horizontalAlignment="ALIGNMENT_CENTER" value="LOCAL int newWithdraw">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/1/@variables.4"/>
-      </link>
->>>>>>>> master:Banking-Evaluation/diagrams/Account/update.diagram
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor4Line"/>
-        <points y="125"/>
-        <points x="200" y="125"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor5Line"/>
-        <points y="170"/>
-        <points x="200" y="170"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor6Line"/>
-        <points y="190"/>
-        <points x="200" y="190"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor7Line"/>
-        <points y="235"/>
-        <points x="200" y="235"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor8Line"/>
-        <points y="255"/>
-        <points x="200" y="255"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="45" y="190" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementSelNameText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement/@commands.0"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.3"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="45" y="125" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(this.currentHeading);((dir >= 0 &amp; dir &lt;= 1 &amp; this.currentHeading >= 0 &amp; this.currentFloorID >= 0&amp; this.env != null &amp; this.env.floors != null &amp; this.currentHeading = dir) &amp; (this.currentHeading == 1)) &amp; (this.env.isTopFloor(this.currentFloorID) == TRUE)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement/@commands.0/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="200" height="45" y="255" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(this.currentHeading);&#xD;&#xA;((this.currentHeading = 1 &amp; this.env.isTopFloor(this.currentFloorID) = TRUE) -> this.currentHeading = 0) &amp; ((this.currentHeading = 0 &amp; this.currentFloorID = 0) -> this.currentHeading = 1)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement/@commands.0/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver1Line"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver2Line"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver3Line"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="45" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="this.env.isTopFloor(this.currentFloorID) == TRUE">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="conditionSelText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement/@guards.0"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="45" x="100" y="190" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementSelNameText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement/@commands.1"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.2"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="45" x="100" y="125" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(this.currentHeading);((dir >= 0 &amp; dir &lt;= 1 &amp; this.currentHeading >= 0 &amp; this.currentFloorID >= 0&amp; this.env != null &amp; this.env.floors != null &amp; this.currentHeading = dir) &amp; (this.currentHeading == 1)) &amp; (this.env.isTopFloor(this.currentFloorID) == FALSE)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement/@commands.1/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(this.currentHeading);&#xD;&#xA;((this.currentHeading = 1 &amp; this.env.isTopFloor(this.currentFloorID) = TRUE) -> this.currentHeading = 0) &amp; ((this.currentHeading = 0 &amp; this.currentFloorID = 0) -> this.currentHeading = 1)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement/@commands.1/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver1Line"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-        <points x="100" y="60"/>
-        <points x="100" y="105"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver2Line"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-        <points x="100" y="125"/>
-        <points x="100" y="170"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver3Line"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-        <points x="100" y="190"/>
-        <points x="100" y="235"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="45" x="100" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="this.env.isTopFloor(this.currentFloorID) == FALSE">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="conditionSelText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement/@guards.1"/>
-      </link>
-    </children>
-  </children>
-<<<<<<<< HEAD:ElevatorOO/features/Base/Elevator/continueInDirection.diagram
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.3" lineWidth="2" filled="true" transparency="0.0" width="200" height="300" x="560" y="1350" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.1/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.5"/>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="200" height="40" horizontalAlignment="ALIGNMENT_CENTER" value="SelectionStatement IF..FI">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="nameText"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="180" y="10" id="de.tu_bs.cs.isf.cbc.tool.unproven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.1/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="20" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="guards">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="guardHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="20" y="105" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="20" y="170" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statements">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="20" y="235" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-        <points y="40"/>
-        <points x="200" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor2Line"/>
-        <points y="60"/>
-        <points x="200" y="60"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor3Line"/>
-        <points y="105"/>
-        <points x="200" y="105"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor4Line"/>
-        <points y="125"/>
-        <points x="200" y="125"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor5Line"/>
-        <points y="170"/>
-        <points x="200" y="170"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor6Line"/>
-        <points y="190"/>
-        <points x="200" y="190"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor7Line"/>
-        <points y="235"/>
-        <points x="200" y="235"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor8Line"/>
-        <points y="255"/>
-        <points x="200" y="255"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="45" y="190" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementSelNameText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.1/@refinement/@commands.0"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.1"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="45" y="125" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(this.currentHeading);((dir >= 0 &amp; dir &lt;= 1 &amp; this.currentHeading >= 0 &amp; this.currentFloorID >= 0&amp; this.env != null &amp; this.env.floors != null &amp; this.currentHeading = dir) &amp; (this.currentHeading != 0)) &amp; (this.currentFloorID == 0)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.1/@refinement/@commands.0/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="200" height="45" y="255" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(this.currentHeading);&#xD;&#xA;((this.currentHeading = 1 &amp; this.env.isTopFloor(this.currentFloorID) = TRUE) -> this.currentHeading = 0) &amp; ((this.currentHeading = 0 &amp; this.currentFloorID = 0) -> this.currentHeading = 1)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.1/@refinement/@commands.0/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver1Line"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver2Line"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver3Line"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="45" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="this.currentFloorID == 0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="conditionSelText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.1/@refinement/@guards.0"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="45" x="100" y="190" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementSelNameText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.1/@refinement/@commands.1"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.0"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="45" x="100" y="125" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(this.currentHeading);((dir >= 0 &amp; dir &lt;= 1 &amp; this.currentHeading >= 0 &amp; this.currentFloorID >= 0&amp; this.env != null &amp; this.env.floors != null &amp; this.currentHeading = dir) &amp; (this.currentHeading != 0)) &amp; (this.currentFloorID != 0)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.1/@refinement/@commands.1/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(this.currentHeading);&#xD;&#xA;((this.currentHeading = 1 &amp; this.env.isTopFloor(this.currentFloorID) = TRUE) -> this.currentHeading = 0) &amp; ((this.currentHeading = 0 &amp; this.currentFloorID = 0) -> this.currentHeading = 1)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.1/@refinement/@commands.1/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver1Line"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-        <points x="100" y="60"/>
-        <points x="100" y="105"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver2Line"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-        <points x="100" y="125"/>
-        <points x="100" y="170"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver3Line"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-        <points x="100" y="190"/>
-        <points x="100" y="235"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="45" x="100" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="this.currentFloorID != 0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="conditionSelText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.1/@refinement/@guards.1"/>
-      </link>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.3" lineWidth="2" filled="true" transparency="0.0" width="300" height="100" x="940" y="1320" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@commands.0/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.6"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="100" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="this.currentFloorID = this.currentFloorID + 1;">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@commands.0/@refinement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(this.currentHeading);(((this.currentHeading = 1 &amp; this.env.isTopFloor(this.currentFloorID) = TRUE) -> this.currentHeading = 0) &amp; ((this.currentHeading = 0 &amp; this.currentFloorID = 0) -> this.currentHeading = 1)) &amp; (this.currentHeading == 1)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@commands.0/@refinement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="200" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(this.currentHeading,this.currentFloorID);&#xD;&#xA;((this.currentHeading = 1 &amp; this.env.isTopFloor(this.currentFloorID) = true) -> this.currentHeading = this.reverse()) &amp; ((this.currentHeading = 0 &amp; this.currentFloorID = 0) -> this.currentHeading = this.reverse())&amp; ((this.currentHeading = 1 ) -> this.currentFloorID = this.currentFloorID + 1)&amp; ((this.currentHeading != 1 ) -> this.currentFloorID = this.currentFloorID - 1)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@commands.0/@refinement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="280" y="10" id="de.tu_bs.cs.isf.cbc.tool.unproven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@commands.0/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="100" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="200" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerSeparater"/>
-        <points y="40"/>
-        <points x="300" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preSep"/>
-        <points x="200"/>
-        <points x="200" y="100"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postSep"/>
-        <points x="100"/>
-        <points x="100" y="100"/>
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.3" lineWidth="2" filled="true" transparency="0.0" width="300" height="100" x="1300" y="1310" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@commands.1/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.7"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="100" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="this.currentFloorID = this.currentFloorID - 1;">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@commands.1/@refinement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(this.currentHeading);(((this.currentHeading = 1 &amp; this.env.isTopFloor(this.currentFloorID) = TRUE) -> this.currentHeading = 0) &amp; ((this.currentHeading = 0 &amp; this.currentFloorID = 0) -> this.currentHeading = 1)) &amp; (this.currentHeading != 1)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@commands.1/@refinement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="200" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(this.currentHeading,this.currentFloorID);&#xD;&#xA;((this.currentHeading = 1 &amp; this.env.isTopFloor(this.currentFloorID) = true) -> this.currentHeading = this.reverse()) &amp; ((this.currentHeading = 0 &amp; this.currentFloorID = 0) -> this.currentHeading = this.reverse())&amp; ((this.currentHeading = 1 ) -> this.currentFloorID = this.currentFloorID + 1)&amp; ((this.currentHeading != 1 ) -> this.currentFloorID = this.currentFloorID - 1)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@commands.1/@refinement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="280" y="10" id="de.tu_bs.cs.isf.cbc.tool.unproven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@commands.1/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="100" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="200" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerSeparater"/>
-        <points y="40"/>
-        <points x="300" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preSep"/>
-        <points x="200"/>
-        <points x="200" y="100"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postSep"/>
-        <points x="100"/>
-        <points x="100" y="100"/>
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.3" lineWidth="2" filled="true" transparency="0.0" width="300" height="100" x="-40" y="1730" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement/@commands.0/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.3"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="100" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="this.currentHeading = this.reverse();">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement/@commands.0/@refinement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable(this.currentHeading);((dir >= 0 &amp; dir &lt;= 1 &amp; this.currentHeading >= 0 &amp; this.currentFloorID >= 0&amp; this.env != null &amp; this.env.floors != null &amp; this.currentHeading = dir) &amp; (this.currentHeading == 1)) &amp; (this.env.isTopFloor(this.currentFloorID) == TRUE)">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement/@commands.0/@refinement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="200" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable(this.currentHeading);&#xD;&#xA;((this.currentHeading = 1 &amp; this.env.isTopFloor(this.currentFloorID) = TRUE) -> this.currentHeading = 0) &amp; ((this.currentHeading = 0 &amp; this.currentFloorID = 0) -> this.currentHeading = 1)">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement/@commands.0/@refinement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="280" y="10" id="de.tu_bs.cs.isf.cbc.tool.unproven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement/@commands.0/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="100" y="5" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Method-Call">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="100" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Statement">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementHeader2"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="200" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerSeparater"/>
-        <points y="40"/>
-        <points x="300" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preSep"/>
-        <points x="200"/>
-        <points x="200" y="100"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postSep"/>
-        <points x="100"/>
-        <points x="100" y="100"/>
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.3" lineWidth="2" filled="true" transparency="0.0" width="300" height="150" x="320" y="1730" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement/@commands.1/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.2"/>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="300" height="30" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Skip">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementNameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement/@commands.1/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="80" y="70" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(this.currentHeading);((dir >= 0 &amp; dir &lt;= 1 &amp; this.currentHeading >= 0 &amp; this.currentFloorID >= 0&amp; this.env != null &amp; this.env.floors != null &amp; this.currentHeading = dir) &amp; (this.currentHeading == 1)) &amp; (this.env.isTopFloor(this.currentFloorID) == FALSE)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preNameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement/@commands.1/@refinement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="80" x="150" y="70" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(this.currentHeading);&#xD;&#xA;((this.currentHeading = 1 &amp; this.env.isTopFloor(this.currentFloorID) = TRUE) -> this.currentHeading = 0) &amp; ((this.currentHeading = 0 &amp; this.currentFloorID = 0) -> this.currentHeading = 1)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postNameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement/@commands.1/@refinement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="280" y="10" id="de.tu_bs.cs.isf.cbc.tool.unproven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement/@commands.1/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="150" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="sepLeft"/>
-        <points x="150" y="40"/>
-        <points x="150" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="sepRight"/>
-        <points x="300" y="40"/>
-        <points x="300" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="sepHeader1"/>
-        <points y="40"/>
-        <points x="300" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="sepHeader"/>
-        <points y="60"/>
-        <points x="300" y="60"/>
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.3" lineWidth="2" filled="true" transparency="0.0" width="300" height="100" x="720" y="1730" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.1/@refinement/@commands.0/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.1"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="100" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="this.currentHeading = this.reverse();">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.1/@refinement/@commands.0/@refinement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable(this.currentHeading);((dir >= 0 &amp; dir &lt;= 1 &amp; this.currentHeading >= 0 &amp; this.currentFloorID >= 0&amp; this.env != null &amp; this.env.floors != null &amp; this.currentHeading = dir) &amp; (this.currentHeading != 0)) &amp; (this.currentFloorID == 0)">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.1/@refinement/@commands.0/@refinement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="200" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable(this.currentHeading);&#xD;&#xA;((this.currentHeading = 1 &amp; this.env.isTopFloor(this.currentFloorID) = TRUE) -> this.currentHeading = 0) &amp; ((this.currentHeading = 0 &amp; this.currentFloorID = 0) -> this.currentHeading = 1)">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.1/@refinement/@commands.0/@refinement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="280" y="10" id="de.tu_bs.cs.isf.cbc.tool.unproven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.1/@refinement/@commands.0/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="100" y="5" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Method-Call">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="100" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Statement">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementHeader2"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="200" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerSeparater"/>
-        <points y="40"/>
-        <points x="300" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preSep"/>
-        <points x="200"/>
-        <points x="200" y="100"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postSep"/>
-        <points x="100"/>
-        <points x="100" y="100"/>
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.3" lineWidth="2" filled="true" transparency="0.0" width="300" height="150" x="1100" y="1750" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.1/@refinement/@commands.1/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.0"/>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="300" height="30" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Skip">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementNameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.1/@refinement/@commands.1/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="80" y="70" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(this.currentHeading);((dir >= 0 &amp; dir &lt;= 1 &amp; this.currentHeading >= 0 &amp; this.currentFloorID >= 0&amp; this.env != null &amp; this.env.floors != null &amp; this.currentHeading = dir) &amp; (this.currentHeading != 0)) &amp; (this.currentFloorID != 0)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preNameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.1/@refinement/@commands.1/@refinement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="80" x="150" y="70" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(this.currentHeading);&#xD;&#xA;((this.currentHeading = 1 &amp; this.env.isTopFloor(this.currentFloorID) = TRUE) -> this.currentHeading = 0) &amp; ((this.currentHeading = 0 &amp; this.currentFloorID = 0) -> this.currentHeading = 1)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postNameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.1/@refinement/@commands.1/@refinement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="280" y="10" id="de.tu_bs.cs.isf.cbc.tool.unproven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.1/@refinement/@commands.1/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="150" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="sepLeft"/>
-        <points x="150" y="40"/>
-        <points x="150" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="sepRight"/>
-        <points x="300" y="40"/>
-        <points x="300" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="sepHeader1"/>
-        <points y="40"/>
-        <points x="300" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="sepHeader"/>
-        <points y="60"/>
-        <points x="300" y="60"/>
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.9/@children.21/@anchors.0" end="//@children.15/@anchors.0">
-========
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@children.1/@anchors.0" end="//@children.1/@anchors.0">
->>>>>>>> master:Banking-Evaluation/diagrams/Account/update.diagram
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-<<<<<<<< HEAD:ElevatorOO/features/Base/Elevator/continueInDirection.diagram
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.9/@children.14/@anchors.0" end="//@children.14/@anchors.0">
-========
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.1/@children.0/@anchors.0" end="//@children.2/@anchors.0">
->>>>>>>> master:Banking-Evaluation/diagrams/Account/update.diagram
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-<<<<<<<< HEAD:ElevatorOO/features/Base/Elevator/continueInDirection.diagram
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.8/@children.21/@anchors.0" end="//@children.13/@anchors.0">
-========
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.1/@children.2/@anchors.0" end="//@children.3/@anchors.0">
->>>>>>>> master:Banking-Evaluation/diagrams/Account/update.diagram
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-<<<<<<<< HEAD:ElevatorOO/features/Base/Elevator/continueInDirection.diagram
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.8/@children.14/@anchors.0" end="//@children.12/@anchors.0">
-========
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.3/@children.0/@anchors.0" end="//@children.4/@anchors.0">
->>>>>>>> master:Banking-Evaluation/diagrams/Account/update.diagram
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-<<<<<<<< HEAD:ElevatorOO/features/Base/Elevator/continueInDirection.diagram
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.6/@children.14/@anchors.0" end="//@children.8/@anchors.0">
-========
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.4/@children.14/@anchors.0" end="//@children.5/@anchors.0">
->>>>>>>> master:Banking-Evaluation/diagrams/Account/update.diagram
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-<<<<<<<< HEAD:ElevatorOO/features/Base/Elevator/continueInDirection.diagram
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.6/@children.21/@anchors.0" end="//@children.9/@anchors.0">
-========
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.5/@children.0/@anchors.0" end="//@children.7/@anchors.0">
->>>>>>>> master:Banking-Evaluation/diagrams/Account/update.diagram
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-<<<<<<<< HEAD:ElevatorOO/features/Base/Elevator/continueInDirection.diagram
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.7/@children.14/@anchors.0" end="//@children.10/@anchors.0">
-========
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.5/@children.2/@anchors.0" end="//@children.6/@anchors.0">
->>>>>>>> master:Banking-Evaluation/diagrams/Account/update.diagram
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-<<<<<<<< HEAD:ElevatorOO/features/Base/Elevator/continueInDirection.diagram
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.7/@children.21/@anchors.0" end="//@children.11/@anchors.0">
-========
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.6/@children.14/@anchors.0" end="//@children.8/@anchors.0">
->>>>>>>> master:Banking-Evaluation/diagrams/Account/update.diagram
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-<<<<<<<< HEAD:ElevatorOO/features/Base/Elevator/continueInDirection.diagram
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.4/@children.2/@anchors.0" end="//@children.7/@anchors.0">
-========
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.3/@children.2/@anchors.0" end="//@children.9/@anchors.0">
->>>>>>>> master:Banking-Evaluation/diagrams/Account/update.diagram
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-<<<<<<<< HEAD:ElevatorOO/features/Base/Elevator/continueInDirection.diagram
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.4/@children.0/@anchors.0" end="//@children.6/@anchors.0">
-========
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.9/@children.2/@anchors.0" end="//@children.12/@anchors.0">
->>>>>>>> master:Banking-Evaluation/diagrams/Account/update.diagram
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-<<<<<<<< HEAD:ElevatorOO/features/Base/Elevator/continueInDirection.diagram
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.3/@children.2/@anchors.0" end="//@children.4/@anchors.0">
-========
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.10/@children.14/@anchors.0" end="//@children.11/@anchors.0">
->>>>>>>> master:Banking-Evaluation/diagrams/Account/update.diagram
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-<<<<<<<< HEAD:ElevatorOO/features/Base/Elevator/continueInDirection.diagram
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.3/@children.0/@anchors.0" end="//@children.5/@anchors.0">
-========
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.9/@children.0/@anchors.0" end="//@children.13/@anchors.0">
->>>>>>>> master:Banking-Evaluation/diagrams/Account/update.diagram
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-<<<<<<<< HEAD:ElevatorOO/features/Base/Elevator/continueInDirection.diagram
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@children.1/@anchors.0" end="//@children.3/@anchors.0">
-========
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.13/@children.2/@anchors.0" end="//@children.10/@anchors.0">
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.13/@children.0/@anchors.0" end="//@children.14/@anchors.0">
->>>>>>>> master:Banking-Evaluation/diagrams/Account/update.diagram
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-  <colors red="227" green="238" blue="249"/>
-  <colors red="255" green="255" blue="255"/>
-  <colors green="127"/>
-  <colors red="255"/>
-  <colors/>
-  <colors red="252" green="207" blue="153"/>
-  <fonts name="Arial" size="9" bold="true"/>
-</pi:Diagram>
diff --git a/Banking-Evaluation/diagrams/Account/updateBalance.diagram.orig b/Banking-Evaluation/diagrams/Account/updateBalance.diagram.orig
deleted file mode 100644
index 10f502888..000000000
--- a/Banking-Evaluation/diagrams/Account/updateBalance.diagram.orig
+++ /dev/null
@@ -1,1877 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<<<<<<<< HEAD:EmailCorC/src/Client/getNameWithKeyword.diagram
-<pi:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:al="http://eclipse.org/graphiti/mm/algorithms" xmlns:pi="http://eclipse.org/graphiti/mm/pictograms" visible="true" gridUnit="10" diagramTypeId="cbc" name="getNameWithKeyword" snapToGrid="true" pictogramLinks="//@children.0/@link //@link //@children.0/@children.0/@link //@children.0/@children.1/@link //@children.0/@children.2/@link //@children.0/@children.4/@link //@children.1/@link //@children.1/@children.1/@link //@children.1/@children.0/@link //@children.1/@children.2/@link //@children.1/@children.4/@link //@children.1/@children.5/@link //@children.1/@children.6/@link //@children.2/@link //@children.2/@children.0/@link //@children.2/@children.1/@link //@children.2/@children.2/@link //@children.2/@children.3/@link //@children.3/@link //@children.3/@children.1/@link //@children.3/@children.0/@link //@children.3/@children.2/@link //@children.3/@children.4/@link //@children.3/@children.5/@link //@children.3/@children.6/@link //@children.4/@link //@children.4/@children.0/@link //@children.4/@children.1/@link //@children.4/@children.2/@link //@children.4/@children.3/@link //@children.5/@link //@children.5/@children.0/@link //@children.5/@children.1/@link //@children.5/@children.2/@link //@children.5/@children.3/@link //@children.6/@link //@children.6/@children.0/@link //@children.6/@children.2/@link //@children.6/@children.3/@link //@children.6/@children.4/@link //@children.6/@children.5/@link //@children.6/@children.6/@link //@children.6/@children.7/@link //@children.6/@children.8/@link //@children.7/@link //@children.7/@children.0/@link" version="0.18.0">
-  <graphicsAlgorithm xsi:type="al:Rectangle" background="//@colors.1" foreground="//@colors.0" lineWidth="1" transparency="0.0" width="1000" height="1000"/>
-  <link>
-    <businessObjects href="getNameWithKeyword.cbcmodel#/0"/>
-  </link>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.3" lineWidth="2" filled="true" transparency="0.0" width="300" height="150" x="20" y="20" cornerHeight="20" cornerWidth="20">
-========
-<pi:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:al="http://eclipse.org/graphiti/mm/algorithms" xmlns:pi="http://eclipse.org/graphiti/mm/pictograms" visible="true" gridUnit="10" diagramTypeId="cbc" name="updateBalance" snapToGrid="true" pictogramLinks="//@children.0/@link //@link //@children.0/@children.0/@link //@children.0/@children.1/@link //@children.0/@children.2/@link //@children.0/@children.4/@link //@children.1/@link //@children.1/@children.1/@link //@children.1/@children.0/@link //@children.1/@children.2/@link //@children.1/@children.4/@link //@children.1/@children.5/@link //@children.1/@children.6/@link //@children.2/@link //@children.2/@children.1/@link //@children.2/@children.0/@link //@children.2/@children.2/@link //@children.2/@children.4/@link //@children.2/@children.5/@link //@children.2/@children.6/@link //@children.3/@link //@children.3/@children.0/@link //@children.3/@children.1/@link //@children.3/@children.2/@link //@children.3/@children.3/@link //@children.4/@link //@children.4/@children.1/@link //@children.4/@children.14/@link //@children.4/@children.15/@link //@children.4/@children.16/@link //@children.4/@children.21/@link //@children.5/@link //@children.5/@children.0/@link //@children.5/@children.1/@link //@children.5/@children.2/@link //@children.5/@children.3/@link //@children.6/@link //@children.6/@children.0/@link //@children.6/@children.1/@link //@children.6/@children.2/@link //@children.6/@children.3/@link //@children.7/@link //@children.7/@children.0/@link //@children.7/@children.2/@link //@children.7/@children.3/@link //@children.7/@children.4/@link //@children.7/@children.5/@link" version="0.18.0">
-  <graphicsAlgorithm xsi:type="al:Rectangle" background="//@colors.1" foreground="//@colors.0" lineWidth="1" transparency="0.0" width="1000" height="1000"/>
-  <link>
-    <businessObjects href="updateBalance.cbcmodel#/0"/>
-  </link>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.3" lineWidth="2" filled="true" transparency="0.0" width="300" height="150" x="300" y="100" cornerHeight="20" cornerWidth="20">
->>>>>>>> master:Banking-Evaluation/diagrams/Account/updateBalance.diagram
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-<<<<<<<< HEAD:EmailCorC/src/Client/getNameWithKeyword.diagram
-      <businessObjects href="getNameWithKeyword.cbcmodel#/0"/>
-    </link>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="90" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="{ true}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getNameWithKeyword.cbcmodel#/0/@statement/@preCondition"/>
-========
-      <businessObjects href="updateBalance.cbcmodel#/0"/>
-    </link>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" y="90" horizontalAlignment="ALIGNMENT_CENTER" value="{pre}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="updateBalance.cbcmodel#/0/@statement/@preCondition"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Account/updateBalance.diagram
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="90" x="100" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementNameText"/>
-      </graphicsAlgorithm>
-      <link>
-<<<<<<<< HEAD:EmailCorC/src/Client/getNameWithKeyword.diagram
-        <businessObjects href="getNameWithKeyword.cbcmodel#/0/@statement"/>
-========
-        <businessObjects href="updateBalance.cbcmodel#/0/@statement"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Account/updateBalance.diagram
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.3"/>
-    </children>
-    <children visible="true" active="true">
-<<<<<<<< HEAD:EmailCorC/src/Client/getNameWithKeyword.diagram
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="90" x="200" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="{ result = this.name}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getNameWithKeyword.cbcmodel#/0/@statement/@postCondition"/>
-========
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="200" y="90" horizontalAlignment="ALIGNMENT_CENTER" value="{post}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="updateBalance.cbcmodel#/0/@statement/@postCondition"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Account/updateBalance.diagram
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="300" height="30" y="5" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Formula">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="nameText"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="280" y="10" id="de.tu_bs.cs.isf.cbc.tool.unproven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-<<<<<<<< HEAD:EmailCorC/src/Client/getNameWithKeyword.diagram
-        <businessObjects href="getNameWithKeyword.cbcmodel#/0"/>
-========
-        <businessObjects href="updateBalance.cbcmodel#/0"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Account/updateBalance.diagram
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="200" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="100" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="stHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-        <points y="40"/>
-        <points x="300" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor2Line"/>
-        <points y="60"/>
-        <points x="300" y="60"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver1Line"/>
-        <points x="100" y="40"/>
-        <points x="100" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver2Line"/>
-        <points x="200" y="40"/>
-        <points x="200" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-<<<<<<<< HEAD:EmailCorC/src/Client/getNameWithKeyword.diagram
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.3" lineWidth="2" filled="true" transparency="0.0" width="500" height="300" x="20" y="220" cornerHeight="20" cornerWidth="20">
-========
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.3" lineWidth="2" filled="true" transparency="0.0" width="500" height="300" x="390" y="360" cornerHeight="20" cornerWidth="20">
->>>>>>>> master:Banking-Evaluation/diagrams/Account/updateBalance.diagram
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-<<<<<<<< HEAD:EmailCorC/src/Client/getNameWithKeyword.diagram
-      <businessObjects href="getNameWithKeyword.cbcmodel#/0/@statement/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.0"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="100" y="200" horizontalAlignment="ALIGNMENT_CENTER" value="statement1">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement1NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getNameWithKeyword.cbcmodel#/0/@statement/@refinement/@firstStatement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.1"/>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="100" x="166" y="200" horizontalAlignment="ALIGNMENT_CENTER" value="{intermediateCond}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="conditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getNameWithKeyword.cbcmodel#/0/@statement/@refinement/@intermediateCondition"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="100" x="332" y="200" horizontalAlignment="ALIGNMENT_CENTER" value="statement2">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement2NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getNameWithKeyword.cbcmodel#/0/@statement/@refinement/@secondStatement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.2"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="500" height="60" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Composition">
-========
-      <businessObjects href="updateBalance.cbcmodel#/0/@statement/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.3"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="110" y="190" horizontalAlignment="ALIGNMENT_CENTER" value="statement1">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement1NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="updateBalance.cbcmodel#/0/@statement/@refinement/@firstStatement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.2"/>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="73" x="166" y="226" horizontalAlignment="ALIGNMENT_CENTER" value="{intermediateCond}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="conditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="updateBalance.cbcmodel#/0/@statement/@refinement/@intermediateCondition"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="110" x="332" y="190" horizontalAlignment="ALIGNMENT_CENTER" value="statement2">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement2NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="updateBalance.cbcmodel#/0/@statement/@refinement/@secondStatement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.1"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="500" height="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Composition">
->>>>>>>> master:Banking-Evaluation/diagrams/Account/updateBalance.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="nameText"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-<<<<<<<< HEAD:EmailCorC/src/Client/getNameWithKeyword.diagram
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="100" y="80" horizontalAlignment="ALIGNMENT_CENTER" value="{ true}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="pre1NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getNameWithKeyword.cbcmodel#/0/@statement/@refinement/@firstStatement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="100" x="250" y="80" horizontalAlignment="ALIGNMENT_CENTER" value="{ result = this.name}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="post2NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getNameWithKeyword.cbcmodel#/0/@statement/@refinement/@secondStatement/@postCondition"/>
-========
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="73" y="96" horizontalAlignment="ALIGNMENT_CENTER" value="{pre}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="pre1NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="updateBalance.cbcmodel#/0/@statement/@refinement/@firstStatement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="73" x="250" y="96" horizontalAlignment="ALIGNMENT_CENTER" value="{post}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="post2NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="updateBalance.cbcmodel#/0/@statement/@refinement/@secondStatement/@postCondition"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Account/updateBalance.diagram
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="480" y="10" id="de.tu_bs.cs.isf.cbc.tool.unproven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-<<<<<<<< HEAD:EmailCorC/src/Client/getNameWithKeyword.diagram
-        <businessObjects href="getNameWithKeyword.cbcmodel#/0/@statement/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" y="60" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-========
-        <businessObjects href="updateBalance.cbcmodel#/0/@statement/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
->>>>>>>> master:Banking-Evaluation/diagrams/Account/updateBalance.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-<<<<<<<< HEAD:EmailCorC/src/Client/getNameWithKeyword.diagram
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" x="250" y="60" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-========
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" x="250" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
->>>>>>>> master:Banking-Evaluation/diagrams/Account/updateBalance.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-<<<<<<<< HEAD:EmailCorC/src/Client/getNameWithKeyword.diagram
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="166" height="20" y="180" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement 1">
-========
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="166" height="20" y="170" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement 1">
->>>>>>>> master:Banking-Evaluation/diagrams/Account/updateBalance.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement1Header"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-<<<<<<<< HEAD:EmailCorC/src/Client/getNameWithKeyword.diagram
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="166" height="20" x="332" y="180" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement 2">
-========
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="166" height="20" x="332" y="170" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement 2">
->>>>>>>> master:Banking-Evaluation/diagrams/Account/updateBalance.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement2Header"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-<<<<<<<< HEAD:EmailCorC/src/Client/getNameWithKeyword.diagram
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="166" height="20" x="166" y="180" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="intermediate condition">
-========
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="166" height="20" x="166" y="170" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="intermediate condition">
->>>>>>>> master:Banking-Evaluation/diagrams/Account/updateBalance.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="intermediateCondHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-<<<<<<<< HEAD:EmailCorC/src/Client/getNameWithKeyword.diagram
-        <points y="60"/>
-        <points x="500" y="60"/>
-========
-        <points y="40"/>
-        <points x="500" y="40"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Account/updateBalance.diagram
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor2Line"/>
-<<<<<<<< HEAD:EmailCorC/src/Client/getNameWithKeyword.diagram
-        <points y="80"/>
-        <points x="500" y="80"/>
-========
-        <points y="60"/>
-        <points x="500" y="60"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Account/updateBalance.diagram
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor3Line"/>
-<<<<<<<< HEAD:EmailCorC/src/Client/getNameWithKeyword.diagram
-        <points y="180"/>
-        <points x="500" y="180"/>
-========
-        <points y="170"/>
-        <points x="500" y="170"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Account/updateBalance.diagram
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor4Line"/>
-<<<<<<<< HEAD:EmailCorC/src/Client/getNameWithKeyword.diagram
-        <points y="200"/>
-        <points x="500" y="200"/>
-========
-        <points y="190"/>
-        <points x="500" y="190"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver1Line"/>
-        <points x="250" y="40"/>
-        <points x="250" y="170"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver2Line"/>
-        <points x="166" y="170"/>
-        <points x="166" y="300"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver3Line"/>
-        <points x="332" y="170"/>
-        <points x="332" y="300"/>
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.3" lineWidth="2" filled="true" transparency="0.0" width="500" height="300" x="1030" y="680" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="updateBalance.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.1"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="100" y="200" horizontalAlignment="ALIGNMENT_CENTER" value="statement1">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement1NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="updateBalance.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.5"/>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="100" x="166" y="200" horizontalAlignment="ALIGNMENT_CENTER" value="{intermediateCond}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="conditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="updateBalance.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@intermediateCondition"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="100" x="332" y="200" horizontalAlignment="ALIGNMENT_CENTER" value="statement2">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement2NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="updateBalance.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.0"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="500" height="60" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Composition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="nameText"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="100" y="80" horizontalAlignment="ALIGNMENT_CENTER" value="{intermediateCond}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="pre1NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="updateBalance.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="100" x="250" y="80" horizontalAlignment="ALIGNMENT_CENTER" value="{post}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="post2NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="updateBalance.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="480" y="10" id="de.tu_bs.cs.isf.cbc.tool.unproven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="updateBalance.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" y="60" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" x="250" y="60" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="166" height="20" y="180" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement 1">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement1Header"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="166" height="20" x="332" y="180" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement 2">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement2Header"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="166" height="20" x="166" y="180" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="intermediate condition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="intermediateCondHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-        <points y="60"/>
-        <points x="500" y="60"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor2Line"/>
-        <points y="80"/>
-        <points x="500" y="80"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor3Line"/>
-        <points y="180"/>
-        <points x="500" y="180"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor4Line"/>
-        <points y="200"/>
-        <points x="500" y="200"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver1Line"/>
-        <points x="250" y="60"/>
-        <points x="250" y="180"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver2Line"/>
-        <points x="166" y="180"/>
-        <points x="166" y="300"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver3Line"/>
-        <points x="332" y="180"/>
-        <points x="332" y="300"/>
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.3" lineWidth="2" filled="true" transparency="0.0" width="300" height="100" x="200" y="740" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="updateBalance.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.2"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="100" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="newBalance = a.balance + x;">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="updateBalance.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="40" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="{pre}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="updateBalance.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="40" x="200" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="{intermediateCond}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="updateBalance.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="280" y="10" id="de.tu_bs.cs.isf.cbc.tool.unproven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="updateBalance.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="100" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="200" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerSeparater"/>
-        <points y="40"/>
-        <points x="300" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preSep"/>
-        <points x="200"/>
-        <points x="200" y="100"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postSep"/>
-        <points x="100"/>
-        <points x="100" y="100"/>
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.3" lineWidth="2" filled="true" transparency="0.0" width="250" height="300" x="690" y="1020" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="updateBalance.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.5"/>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="40" horizontalAlignment="ALIGNMENT_CENTER" value="SelectionStatement IF..FI">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="nameText"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="230" y="10" id="de.tu_bs.cs.isf.cbc.tool.unproven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="updateBalance.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="guards">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="guardHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" y="105" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" y="170" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statements">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" y="235" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-        <points y="40"/>
-        <points x="250" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor2Line"/>
-        <points y="60"/>
-        <points x="250" y="60"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor3Line"/>
-        <points y="105"/>
-        <points x="250" y="105"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor4Line"/>
-        <points y="125"/>
-        <points x="250" y="125"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Account/updateBalance.diagram
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-<<<<<<<< HEAD:EmailCorC/src/Client/getNameWithKeyword.diagram
-========
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor5Line"/>
-        <points y="170"/>
-        <points x="250" y="170"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor6Line"/>
-        <points y="190"/>
-        <points x="250" y="190"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor7Line"/>
-        <points y="235"/>
-        <points x="250" y="235"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor8Line"/>
-        <points y="255"/>
-        <points x="250" y="255"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="45" y="190" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementSelNameText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="updateBalance.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.4"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="45" y="125" horizontalAlignment="ALIGNMENT_CENTER" value="{(intermediateCond) &amp; (newBalance &lt; a.OVERDRAFT_LIMIT)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="updateBalance.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="45" y="255" horizontalAlignment="ALIGNMENT_CENTER" value="{intermediateCond}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="updateBalance.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
->>>>>>>> master:Banking-Evaluation/diagrams/Account/updateBalance.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver1Line"/>
-        <points x="250" y="60"/>
-        <points x="250" y="180"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver2Line"/>
-        <points x="166" y="180"/>
-        <points x="166" y="300"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver3Line"/>
-        <points x="332" y="180"/>
-        <points x="332" y="300"/>
-      </graphicsAlgorithm>
-    </children>
-<<<<<<<< HEAD:EmailCorC/src/Client/getNameWithKeyword.diagram
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.3" lineWidth="2" filled="true" transparency="0.0" width="300" height="100" x="-80" y="570" cornerHeight="20" cornerWidth="20">
-========
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver4Line"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="45" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="newBalance &lt; a.OVERDRAFT_LIMIT">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="conditionSelText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="updateBalance.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@guards.0"/>
-      </link>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.3" lineWidth="2" filled="true" transparency="0.0" width="300" height="100" x="1460" y="1100" cornerHeight="20" cornerWidth="20">
->>>>>>>> master:Banking-Evaluation/diagrams/Account/updateBalance.diagram
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-<<<<<<<< HEAD:EmailCorC/src/Client/getNameWithKeyword.diagram
-      <businessObjects href="getNameWithKeyword.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement"/>
-========
-      <businessObjects href="updateBalance.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Account/updateBalance.diagram
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.0"/>
-    <children visible="true" active="true">
-<<<<<<<< HEAD:EmailCorC/src/Client/getNameWithKeyword.diagram
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="100" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="result = null;">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getNameWithKeyword.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement"/>
-========
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="100" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="a.balance = newBalance;">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="updateBalance.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Account/updateBalance.diagram
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-<<<<<<<< HEAD:EmailCorC/src/Client/getNameWithKeyword.diagram
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{ true}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getNameWithKeyword.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="200" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{intermediateCond}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getNameWithKeyword.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement/@postCondition"/>
-========
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{intermediateCond}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="updateBalance.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="200" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{post}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="updateBalance.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@postCondition"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Account/updateBalance.diagram
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="280" y="10" id="de.tu_bs.cs.isf.cbc.tool.unproven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-<<<<<<<< HEAD:EmailCorC/src/Client/getNameWithKeyword.diagram
-        <businessObjects href="getNameWithKeyword.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement"/>
-========
-        <businessObjects href="updateBalance.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Account/updateBalance.diagram
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="100" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="200" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerSeparater"/>
-        <points y="40"/>
-        <points x="300" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preSep"/>
-        <points x="200"/>
-        <points x="200" y="100"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postSep"/>
-        <points x="100"/>
-        <points x="100" y="100"/>
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-<<<<<<<< HEAD:EmailCorC/src/Client/getNameWithKeyword.diagram
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.3" lineWidth="2" filled="true" transparency="0.0" width="500" height="300" x="320" y="570" cornerHeight="20" cornerWidth="20">
-========
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.3" lineWidth="2" filled="true" transparency="0.0" width="300" height="100" x="810" y="1390" cornerHeight="20" cornerWidth="20">
->>>>>>>> master:Banking-Evaluation/diagrams/Account/updateBalance.diagram
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-<<<<<<<< HEAD:EmailCorC/src/Client/getNameWithKeyword.diagram
-      <businessObjects href="getNameWithKeyword.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement"/>
-========
-      <businessObjects href="updateBalance.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Account/updateBalance.diagram
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.4"/>
-    <children visible="true" active="true">
-<<<<<<<< HEAD:EmailCorC/src/Client/getNameWithKeyword.diagram
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="100" y="200" horizontalAlignment="ALIGNMENT_CENTER" value="statement1">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement1NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getNameWithKeyword.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement"/>
-========
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="100" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="result = false;">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="updateBalance.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Account/updateBalance.diagram
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.3"/>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="100" x="166" y="200" horizontalAlignment="ALIGNMENT_CENTER" value="{intermediateCond}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="conditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getNameWithKeyword.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@intermediateCondition"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="100" x="332" y="200" horizontalAlignment="ALIGNMENT_CENTER" value="statement2">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement2NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getNameWithKeyword.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.4"/>
-    </children>
-    <children visible="true">
-<<<<<<<< HEAD:EmailCorC/src/Client/getNameWithKeyword.diagram
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="500" height="60" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Composition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="nameText"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="100" y="80" horizontalAlignment="ALIGNMENT_CENTER" value="{intermediateCond}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="pre1NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getNameWithKeyword.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="100" x="250" y="80" horizontalAlignment="ALIGNMENT_CENTER" value="{ result = this.name}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="post2NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getNameWithKeyword.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="480" y="10" id="de.tu_bs.cs.isf.cbc.tool.unproven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getNameWithKeyword.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" y="60" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-========
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{(intermediateCond) &amp; (newBalance &lt; a.OVERDRAFT_LIMIT)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="updateBalance.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="200" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{intermediateCond}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="updateBalance.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="280" y="10" id="de.tu_bs.cs.isf.cbc.tool.unproven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="updateBalance.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="100" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
->>>>>>>> master:Banking-Evaluation/diagrams/Account/updateBalance.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-<<<<<<<< HEAD:EmailCorC/src/Client/getNameWithKeyword.diagram
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" x="250" y="60" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-========
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="200" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
->>>>>>>> master:Banking-Evaluation/diagrams/Account/updateBalance.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-<<<<<<<< HEAD:EmailCorC/src/Client/getNameWithKeyword.diagram
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="166" height="20" y="180" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement 1">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement1Header"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="166" height="20" x="332" y="180" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement 2">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement2Header"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="166" height="20" x="166" y="180" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="intermediate condition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="intermediateCondHeader"/>
-========
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerSeparater"/>
-        <points y="40"/>
-        <points x="300" y="40"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Account/updateBalance.diagram
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-<<<<<<<< HEAD:EmailCorC/src/Client/getNameWithKeyword.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-        <points y="60"/>
-        <points x="500" y="60"/>
-========
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preSep"/>
-        <points x="200"/>
-        <points x="200" y="100"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Account/updateBalance.diagram
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-<<<<<<<< HEAD:EmailCorC/src/Client/getNameWithKeyword.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor2Line"/>
-        <points y="80"/>
-        <points x="500" y="80"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor3Line"/>
-        <points y="180"/>
-        <points x="500" y="180"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor4Line"/>
-        <points y="200"/>
-        <points x="500" y="200"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver1Line"/>
-        <points x="250" y="60"/>
-        <points x="250" y="180"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver2Line"/>
-        <points x="166" y="180"/>
-        <points x="166" y="300"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver3Line"/>
-        <points x="332" y="180"/>
-        <points x="332" y="300"/>
-========
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postSep"/>
-        <points x="100"/>
-        <points x="100" y="100"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Account/updateBalance.diagram
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-<<<<<<<< HEAD:EmailCorC/src/Client/getNameWithKeyword.diagram
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.3" lineWidth="2" filled="true" transparency="0.0" width="300" height="100" x="220" y="920" cornerHeight="20" cornerWidth="20">
-========
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" lineWidth="1" filled="true" transparency="0.0" width="200" height="100" x="950" y="110" cornerHeight="20" cornerWidth="20">
->>>>>>>> master:Banking-Evaluation/diagrams/Account/updateBalance.diagram
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-<<<<<<<< HEAD:EmailCorC/src/Client/getNameWithKeyword.diagram
-      <businessObjects href="getNameWithKeyword.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.3"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="100" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="result = this.name;">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getNameWithKeyword.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{intermediateCond}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getNameWithKeyword.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="200" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{intermediateCond}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getNameWithKeyword.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="280" y="10" id="de.tu_bs.cs.isf.cbc.tool.unproven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getNameWithKeyword.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="100" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="200" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerSeparater"/>
-        <points y="40"/>
-        <points x="300" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preSep"/>
-        <points x="200"/>
-        <points x="200" y="100"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postSep"/>
-        <points x="100"/>
-        <points x="100" y="100"/>
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.3" lineWidth="2" filled="true" transparency="0.0" width="300" height="100" x="620" y="920" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="getNameWithKeyword.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.4"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="100" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="result = result;">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getNameWithKeyword.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{intermediateCond}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getNameWithKeyword.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="200" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{ result = this.name}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getNameWithKeyword.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="280" y="10" id="de.tu_bs.cs.isf.cbc.tool.unproven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getNameWithKeyword.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="100" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="ReturnStatement">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="200" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerSeparater"/>
-        <points y="40"/>
-        <points x="300" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preSep"/>
-        <points x="200"/>
-        <points x="200" y="100"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postSep"/>
-        <points x="100"/>
-        <points x="100" y="100"/>
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" lineWidth="1" filled="true" transparency="0.0" width="200" height="100" x="600" y="20" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="getNameWithKeyword.cbcmodel#/1"/>
-    </link>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="12" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Variables">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variablesName"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getNameWithKeyword.cbcmodel#/1"/>
-========
-      <businessObjects href="updateBalance.cbcmodel#/1"/>
-    </link>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Variables">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variablesName"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="updateBalance.cbcmodel#/1"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Account/updateBalance.diagram
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-<<<<<<<< HEAD:EmailCorC/src/Client/getNameWithKeyword.diagram
-        <points y="12"/>
-        <points x="200" y="12"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="12" y="12" horizontalAlignment="ALIGNMENT_CENTER" value="PRIVATE String name">
-========
-        <points y="20"/>
-        <points x="200" y="20"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="20" y="80" horizontalAlignment="ALIGNMENT_CENTER" value="LOCAL int newBalance">
->>>>>>>> master:Banking-Evaluation/diagrams/Account/updateBalance.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="3"/>
-      </graphicsAlgorithm>
-      <link>
-<<<<<<<< HEAD:EmailCorC/src/Client/getNameWithKeyword.diagram
-        <businessObjects href="Client.cbcclass#//@fields.0"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="12" y="24" horizontalAlignment="ALIGNMENT_CENTER" value="PRIVATE int id">
-========
-        <businessObjects href="updateBalance.cbcmodel#/1/@variables.0"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="20" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="LOCAL boolean result">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="2"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="updateBalance.cbcmodel#/1/@variables.1"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="20" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="PARAM int x">
->>>>>>>> master:Banking-Evaluation/diagrams/Account/updateBalance.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-      </graphicsAlgorithm>
-      <link>
-<<<<<<<< HEAD:EmailCorC/src/Client/getNameWithKeyword.diagram
-        <businessObjects href="Client.cbcclass#//@fields.1"/>
-========
-        <businessObjects href="updateBalance.cbcmodel#/1/@variables.2"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="20" y="20" horizontalAlignment="ALIGNMENT_CENTER" value="LOCAL Account a">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="updateBalance.cbcmodel#/1/@variables.3"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Account/updateBalance.diagram
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="12" y="36" horizontalAlignment="ALIGNMENT_CENTER" value="PRIVATE static Client[] clients">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="2"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Client.cbcclass#//@fields.2"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="12" y="48" horizontalAlignment="ALIGNMENT_CENTER" value="PRIVATE static int clientCounter">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="3"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Client.cbcclass#//@fields.3"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="12" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="PRIVATE static int old_clientCounter">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="4"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Client.cbcclass#//@fields.4"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="12" y="72" horizontalAlignment="ALIGNMENT_CENTER" value="RETURN String result">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="5"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getNameWithKeyword.cbcmodel#/1/@variables.0"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="12" y="84" horizontalAlignment="ALIGNMENT_CENTER" value="LOCAL String result">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="6"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getNameWithKeyword.cbcmodel#/1/@variables.1"/>
-      </link>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" lineWidth="1" filled="true" transparency="0.0" width="200" height="100" x="600" y="220" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="getNameWithKeyword.cbcmodel#/2"/>
-    </link>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="100" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Global Conditions">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="globalConditionsName"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getNameWithKeyword.cbcmodel#/2"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-        <points y="100"/>
-        <points x="200" y="100"/>
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.2/@children.2/@anchors.0" end="//@children.5/@anchors.0">
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.1/@children.2/@anchors.0" end="//@children.2/@anchors.0">
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.1/@children.0/@anchors.0" end="//@children.3/@anchors.0">
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@children.1/@anchors.0" end="//@children.1/@anchors.0">
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-<<<<<<<< HEAD:EmailCorC/src/Client/getNameWithKeyword.diagram
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.1/@children.0/@anchors.0" end="//@children.2/@anchors.0">
-========
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.4/@children.14/@anchors.0" end="//@children.6/@anchors.0">
->>>>>>>> master:Banking-Evaluation/diagrams/Account/updateBalance.diagram
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-<<<<<<<< HEAD:EmailCorC/src/Client/getNameWithKeyword.diagram
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.1/@children.2/@anchors.0" end="//@children.3/@anchors.0">
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.3/@children.0/@anchors.0" end="//@children.4/@anchors.0">
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.3/@children.2/@anchors.0" end="//@children.5/@anchors.0">
-========
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.2/@children.0/@anchors.0" end="//@children.4/@anchors.0">
->>>>>>>> master:Banking-Evaluation/diagrams/Account/updateBalance.diagram
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-  <colors red="227" green="238" blue="249"/>
-  <colors red="255" green="255" blue="255"/>
-  <colors green="127"/>
-  <colors red="255"/>
-  <colors/>
-  <colors red="252" green="207" blue="153"/>
-  <fonts name="Arial" size="9" bold="true"/>
-</pi:Diagram>
diff --git a/Banking-Evaluation/diagrams/Transaction/lock.diagram.orig b/Banking-Evaluation/diagrams/Transaction/lock.diagram.orig
deleted file mode 100644
index 66fd12967..000000000
--- a/Banking-Evaluation/diagrams/Transaction/lock.diagram.orig
+++ /dev/null
@@ -1,2502 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<<<<<<<< HEAD:BankAccountCorC/src/Account/bankAccountUpdate.diagram
-<pi:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:al="http://eclipse.org/graphiti/mm/algorithms" xmlns:pi="http://eclipse.org/graphiti/mm/pictograms" visible="true" gridUnit="10" diagramTypeId="cbc" name="bankAccountUpdate" snapToGrid="true" pictogramLinks="//@children.0/@link //@link //@children.0/@children.0/@link //@children.0/@children.1/@link //@children.0/@children.2/@link //@children.0/@children.4/@link //@children.1/@link //@children.1/@children.1/@link //@children.1/@children.0/@link //@children.1/@children.2/@link //@children.1/@children.4/@link //@children.1/@children.5/@link //@children.1/@children.6/@link //@children.2/@link //@children.2/@children.0/@link //@children.2/@children.1/@link //@children.2/@children.2/@link //@children.2/@children.3/@link //@children.3/@link //@children.3/@children.1/@link //@children.3/@children.0/@link //@children.3/@children.2/@link //@children.3/@children.4/@link //@children.3/@children.5/@link //@children.3/@children.6/@link //@children.4/@link //@children.4/@children.1/@link //@children.4/@children.14/@link //@children.4/@children.15/@link //@children.4/@children.16/@link //@children.4/@children.20/@link //@children.4/@children.21/@link //@children.4/@children.22/@link //@children.4/@children.23/@link //@children.4/@children.27/@link //@children.5/@link //@children.5/@children.0/@link //@children.5/@children.1/@link //@children.5/@children.2/@link //@children.5/@children.3/@link //@children.6/@link //@children.6/@children.0/@link //@children.6/@children.1/@link //@children.6/@children.2/@link //@children.6/@children.3/@link //@children.7/@link //@children.7/@children.0/@link //@children.7/@children.1/@link //@children.7/@children.2/@link //@children.7/@children.3/@link //@children.8/@link //@children.8/@children.0/@link //@children.8/@children.2/@link //@children.8/@children.3/@link //@children.8/@children.4/@link //@children.8/@children.5/@link //@children.8/@children.6/@link //@children.8/@children.7/@link //@children.8/@children.8/@link //@children.8/@children.9/@link //@children.8/@children.10/@link //@children.8/@children.11/@link //@children.8/@children.12/@link //@children.8/@children.13/@link //@children.9/@link //@children.9/@children.0/@link //@children.9/@children.2/@link" version="0.18.0">
-  <graphicsAlgorithm xsi:type="al:Rectangle" background="//@colors.1" foreground="//@colors.0" lineWidth="1" transparency="0.0" width="1000" height="1000"/>
-  <link>
-    <businessObjects href="bankAccountUpdate.cbcmodel#/0"/>
-  </link>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="751" height="171" x="20" y="20" cornerHeight="20" cornerWidth="20">
-========
-<pi:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:al="http://eclipse.org/graphiti/mm/algorithms" xmlns:pi="http://eclipse.org/graphiti/mm/pictograms" visible="true" gridUnit="10" diagramTypeId="cbc" name="lock" snapToGrid="true" pictogramLinks="//@children.0/@link //@link //@children.0/@children.0/@link //@children.0/@children.1/@link //@children.0/@children.2/@link //@children.0/@children.4/@link //@children.1/@link //@children.1/@children.1/@link //@children.1/@children.2/@link //@children.2/@link //@children.2/@children.0/@link //@children.2/@children.10/@link //@children.2/@children.11/@link //@children.2/@children.12/@link //@children.2/@children.13/@link //@children.2/@children.14/@link //@children.2/@children.15/@link //@children.2/@children.16/@link //@children.2/@children.17/@link //@children.2/@children.18/@link //@children.2/@children.19/@link //@children.2/@children.20/@link //@children.2/@children.21/@link //@children.3/@link //@children.3/@children.1/@link //@children.3/@children.0/@link //@children.3/@children.2/@link //@children.3/@children.4/@link //@children.3/@children.5/@link //@children.3/@children.6/@link //@children.4/@link //@children.4/@children.1/@link //@children.4/@children.0/@link //@children.4/@children.2/@link //@children.4/@children.4/@link //@children.4/@children.5/@link //@children.4/@children.6/@link //@children.5/@link //@children.5/@children.1/@link //@children.5/@children.14/@link //@children.5/@children.15/@link //@children.5/@children.16/@link //@children.5/@children.21/@link //@children.6/@link //@children.6/@children.1/@link //@children.6/@children.14/@link //@children.6/@children.15/@link //@children.6/@children.16/@link //@children.6/@children.21/@link //@children.7/@link //@children.7/@children.0/@link //@children.7/@children.1/@link //@children.7/@children.2/@link //@children.7/@children.3/@link //@children.8/@link //@children.8/@children.0/@link //@children.8/@children.1/@link //@children.8/@children.2/@link //@children.8/@children.3/@link //@children.9/@link //@children.9/@children.0/@link //@children.9/@children.1/@link //@children.9/@children.2/@link //@children.9/@children.3/@link" version="0.14.0">
-  <graphicsAlgorithm xsi:type="al:Rectangle" background="//@colors.1" foreground="//@colors.0" lineWidth="1" transparency="0.0" width="1000" height="1000"/>
-  <link>
-    <businessObjects href="lock.cbcmodel#/0"/>
-  </link>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.3" lineWidth="2" filled="true" transparency="0.0" width="300" height="150" x="480" y="140" cornerHeight="20" cornerWidth="20">
->>>>>>>> master:Banking-Evaluation/diagrams/Transaction/lock.diagram
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-<<<<<<<< HEAD:BankAccountCorC/src/Account/bankAccountUpdate.diagram
-      <businessObjects href="bankAccountUpdate.cbcmodel#/0"/>
-    </link>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="111" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="{ true}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="bankAccountUpdate.cbcmodel#/0/@statement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="111" x="250" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementNameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="bankAccountUpdate.cbcmodel#/0/@statement"/>
-========
-      <businessObjects href="lock.cbcmodel#/0"/>
-    </link>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="90" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="{pre}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="lock.cbcmodel#/0/@statement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="90" x="100" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementNameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="lock.cbcmodel#/0/@statement"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Transaction/lock.diagram
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.6"/>
-    </children>
-    <children visible="true" active="true">
-<<<<<<<< HEAD:BankAccountCorC/src/Account/bankAccountUpdate.diagram
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="111" x="500" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="{(\result = FALSE -> balance = \old(balance)) &amp; (\result = TRUE -> balance = \old(balance) + x)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="bankAccountUpdate.cbcmodel#/0/@statement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="751" height="30" y="5" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Formula">
-========
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="90" x="200" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="{post}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="lock.cbcmodel#/0/@statement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="300" height="30" y="5" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Formula">
->>>>>>>> master:Banking-Evaluation/diagrams/Transaction/lock.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="nameText"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-<<<<<<<< HEAD:BankAccountCorC/src/Account/bankAccountUpdate.diagram
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="731" y="10" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="bankAccountUpdate.cbcmodel#/0"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-========
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="280" y="10" id="de.tu_bs.cs.isf.cbc.tool.unproven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="lock.cbcmodel#/0"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
->>>>>>>> master:Banking-Evaluation/diagrams/Transaction/lock.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-<<<<<<<< HEAD:BankAccountCorC/src/Account/bankAccountUpdate.diagram
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" x="500" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-========
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="200" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
->>>>>>>> master:Banking-Evaluation/diagrams/Transaction/lock.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-<<<<<<<< HEAD:BankAccountCorC/src/Account/bankAccountUpdate.diagram
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" x="250" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
-========
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="100" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
->>>>>>>> master:Banking-Evaluation/diagrams/Transaction/lock.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="stHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-        <points y="40"/>
-<<<<<<<< HEAD:BankAccountCorC/src/Account/bankAccountUpdate.diagram
-        <points x="751" y="40"/>
-========
-        <points x="300" y="40"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Transaction/lock.diagram
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor2Line"/>
-        <points y="60"/>
-<<<<<<<< HEAD:BankAccountCorC/src/Account/bankAccountUpdate.diagram
-        <points x="751" y="60"/>
-========
-        <points x="300" y="60"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Transaction/lock.diagram
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver1Line"/>
-<<<<<<<< HEAD:BankAccountCorC/src/Account/bankAccountUpdate.diagram
-        <points x="250" y="40"/>
-        <points x="250" y="171"/>
-========
-        <points x="100" y="40"/>
-        <points x="100" y="150"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Transaction/lock.diagram
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver2Line"/>
-<<<<<<<< HEAD:BankAccountCorC/src/Account/bankAccountUpdate.diagram
-        <points x="500" y="40"/>
-        <points x="500" y="171"/>
-========
-        <points x="200" y="40"/>
-        <points x="200" y="150"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Transaction/lock.diagram
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-<<<<<<<< HEAD:BankAccountCorC/src/Account/bankAccountUpdate.diagram
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="500" height="300" x="160" y="330" cornerHeight="20" cornerWidth="20">
-========
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" lineWidth="1" filled="true" transparency="0.0" width="200" height="100" x="1090" y="180" cornerHeight="20" cornerWidth="20">
->>>>>>>> master:Banking-Evaluation/diagrams/Transaction/lock.diagram
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-<<<<<<<< HEAD:BankAccountCorC/src/Account/bankAccountUpdate.diagram
-      <businessObjects href="bankAccountUpdate.cbcmodel#/0/@statement/@refinement"/>
-========
-      <businessObjects href="lock.cbcmodel#/1"/>
-    </link>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="33" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Method Link">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="methodLinkName"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="33" y="33" horizontalAlignment="ALIGNMENT_CENTER" value="Transaction">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="methodlink_class"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="lock.cbcmodel#/1"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="33" y="66" horizontalAlignment="ALIGNMENT_CENTER" value="boolean lock(Account,Account)">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="methodlink_signature"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="lock.cbcmodel#/1"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-        <points y="33"/>
-        <points x="200" y="33"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" lineStyle="DOT" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor2Line"/>
-        <points y="66"/>
-        <points x="200" y="66"/>
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" lineWidth="1" filled="true" transparency="0.0" width="400" height="150" x="1420" y="100" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="lock.cbcmodel#/2"/>
-    </link>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="400" height="30" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Variables">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="RenamingName"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="lock.cbcmodel#/2"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="30" y="30" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Confidentiality">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="confHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="30" x="100" y="30" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Modifier">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variableModifier"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="30" x="200" y="30" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Type">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="typeHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="30" x="300" y="30" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Name">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="nameHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Header"/>
-        <points y="30"/>
-        <points x="400" y="30"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor2Header"/>
-        <points y="60"/>
-        <points x="400" y="60"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver1Header"/>
-        <points x="100" y="30"/>
-        <points x="100" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver2Header"/>
-        <points x="200" y="30"/>
-        <points x="200" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver3Header"/>
-        <points x="300" y="30"/>
-        <points x="300" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="30" x="300" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="source">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variableName"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="lock.cbcmodel#/2/@variables.0"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="30" x="200" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="Account">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variableType"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="lock.cbcmodel#/2/@variables.0"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="30" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="low">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variableConf"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="lock.cbcmodel#/2/@variables.0"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="30" x="100" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="mut">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variableModifier"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="lock.cbcmodel#/2/@variables.0"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="30" x="300" y="90" horizontalAlignment="ALIGNMENT_CENTER" value="destination">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variableName"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="lock.cbcmodel#/2/@variables.1"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="30" x="200" y="90" horizontalAlignment="ALIGNMENT_CENTER" value="Account">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variableType"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="lock.cbcmodel#/2/@variables.1"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="30" y="90" horizontalAlignment="ALIGNMENT_CENTER" value="low">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variableConf"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="lock.cbcmodel#/2/@variables.1"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="30" x="100" y="90" horizontalAlignment="ALIGNMENT_CENTER" value="mut">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variableModifier"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="lock.cbcmodel#/2/@variables.1"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="30" x="300" y="120" horizontalAlignment="ALIGNMENT_CENTER" value="result">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variableName"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="2"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="lock.cbcmodel#/2/@variables.2"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="30" x="200" y="120" horizontalAlignment="ALIGNMENT_CENTER" value="boolean">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variableType"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="2"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="lock.cbcmodel#/2/@variables.2"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="30" y="120" horizontalAlignment="ALIGNMENT_CENTER" value="low">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variableConf"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="2"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="lock.cbcmodel#/2/@variables.2"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="30" x="100" y="120" horizontalAlignment="ALIGNMENT_CENTER" value="imm">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variableModifier"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="2"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="lock.cbcmodel#/2/@variables.2"/>
-      </link>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.3" lineWidth="2" filled="true" transparency="0.0" width="500" height="300" x="490" y="400" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="lock.cbcmodel#/0/@statement/@refinement"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Transaction/lock.diagram
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.6"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="100" y="200" horizontalAlignment="ALIGNMENT_CENTER" value="statement1">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement1NameText"/>
-      </graphicsAlgorithm>
-      <link>
-<<<<<<<< HEAD:BankAccountCorC/src/Account/bankAccountUpdate.diagram
-        <businessObjects href="bankAccountUpdate.cbcmodel#/0/@statement/@refinement/@firstStatement"/>
-========
-        <businessObjects href="lock.cbcmodel#/0/@statement/@refinement/@firstStatement"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Transaction/lock.diagram
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.0"/>
-    </children>
-    <children visible="true" active="true">
-<<<<<<<< HEAD:BankAccountCorC/src/Account/bankAccountUpdate.diagram
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="100" x="166" y="200" horizontalAlignment="ALIGNMENT_CENTER" value="{newBalance = balance + x}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="conditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="bankAccountUpdate.cbcmodel#/0/@statement/@refinement/@intermediateCondition"/>
-========
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="100" x="166" y="200" horizontalAlignment="ALIGNMENT_CENTER" value="{intermediateCond}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="conditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="lock.cbcmodel#/0/@statement/@refinement/@intermediateCondition"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Transaction/lock.diagram
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="100" x="332" y="200" horizontalAlignment="ALIGNMENT_CENTER" value="statement2">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement2NameText"/>
-      </graphicsAlgorithm>
-      <link>
-<<<<<<<< HEAD:BankAccountCorC/src/Account/bankAccountUpdate.diagram
-        <businessObjects href="bankAccountUpdate.cbcmodel#/0/@statement/@refinement/@secondStatement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.1"/>
-========
-        <businessObjects href="lock.cbcmodel#/0/@statement/@refinement/@secondStatement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.3"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Transaction/lock.diagram
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="500" height="60" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Composition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="nameText"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-<<<<<<<< HEAD:BankAccountCorC/src/Account/bankAccountUpdate.diagram
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="100" y="80" horizontalAlignment="ALIGNMENT_CENTER" value="{ true}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="pre1NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="bankAccountUpdate.cbcmodel#/0/@statement/@refinement/@firstStatement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="100" x="250" y="80" horizontalAlignment="ALIGNMENT_CENTER" value="{(\result = FALSE -> balance = \old(balance)) &amp; (\result = TRUE -> balance = \old(balance) + x)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="post2NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="bankAccountUpdate.cbcmodel#/0/@statement/@refinement/@secondStatement/@postCondition"/>
-========
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="100" y="80" horizontalAlignment="ALIGNMENT_CENTER" value="{pre}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="pre1NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="lock.cbcmodel#/0/@statement/@refinement/@firstStatement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="100" x="250" y="80" horizontalAlignment="ALIGNMENT_CENTER" value="{post}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="post2NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="lock.cbcmodel#/0/@statement/@refinement/@secondStatement/@postCondition"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Transaction/lock.diagram
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="480" y="10" id="de.tu_bs.cs.isf.cbc.tool.unproven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-<<<<<<<< HEAD:BankAccountCorC/src/Account/bankAccountUpdate.diagram
-        <businessObjects href="bankAccountUpdate.cbcmodel#/0/@statement/@refinement"/>
-========
-        <businessObjects href="lock.cbcmodel#/0/@statement/@refinement"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Transaction/lock.diagram
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" y="60" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" x="250" y="60" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="166" height="20" y="180" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement 1">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement1Header"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="166" height="20" x="332" y="180" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement 2">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement2Header"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="166" height="20" x="166" y="180" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="intermediate condition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="intermediateCondHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-        <points y="60"/>
-        <points x="500" y="60"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor2Line"/>
-        <points y="80"/>
-        <points x="500" y="80"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor3Line"/>
-        <points y="180"/>
-        <points x="500" y="180"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor4Line"/>
-        <points y="200"/>
-        <points x="500" y="200"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver1Line"/>
-        <points x="250" y="60"/>
-        <points x="250" y="180"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver2Line"/>
-        <points x="166" y="180"/>
-        <points x="166" y="300"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver3Line"/>
-        <points x="332" y="180"/>
-        <points x="332" y="300"/>
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-<<<<<<<< HEAD:BankAccountCorC/src/Account/bankAccountUpdate.diagram
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="300" height="100" x="60" y="680" cornerHeight="20" cornerWidth="20">
-========
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.3" lineWidth="2" filled="true" transparency="0.0" width="500" height="300" x="1080" y="740" cornerHeight="20" cornerWidth="20">
->>>>>>>> master:Banking-Evaluation/diagrams/Transaction/lock.diagram
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-<<<<<<<< HEAD:BankAccountCorC/src/Account/bankAccountUpdate.diagram
-      <businessObjects href="bankAccountUpdate.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.0"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="100" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="newBalance = balance + x;">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="bankAccountUpdate.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{ true}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="bankAccountUpdate.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="200" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{newBalance = balance + x}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="bankAccountUpdate.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="280" y="10" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="bankAccountUpdate.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="100" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="200" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerSeparater"/>
-        <points y="40"/>
-        <points x="300" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preSep"/>
-        <points x="200"/>
-        <points x="200" y="100"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postSep"/>
-        <points x="100"/>
-        <points x="100" y="100"/>
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="500" height="300" x="460" y="680" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="bankAccountUpdate.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.1"/>
-========
-      <businessObjects href="lock.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.3"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Transaction/lock.diagram
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="100" y="200" horizontalAlignment="ALIGNMENT_CENTER" value="statement1">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement1NameText"/>
-      </graphicsAlgorithm>
-      <link>
-<<<<<<<< HEAD:BankAccountCorC/src/Account/bankAccountUpdate.diagram
-        <businessObjects href="bankAccountUpdate.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.2"/>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="100" x="166" y="200" horizontalAlignment="ALIGNMENT_CENTER" value="{(result = FALSE -> balance = \old(balance)) &amp; (result = TRUE -> balance = \old(balance) + x)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="conditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="bankAccountUpdate.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@intermediateCondition"/>
-========
-        <businessObjects href="lock.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.4"/>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="100" x="166" y="200" horizontalAlignment="ALIGNMENT_CENTER" value="{intermediateCond}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="conditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="lock.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@intermediateCondition"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Transaction/lock.diagram
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="100" x="332" y="200" horizontalAlignment="ALIGNMENT_CENTER" value="statement2">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement2NameText"/>
-      </graphicsAlgorithm>
-      <link>
-<<<<<<<< HEAD:BankAccountCorC/src/Account/bankAccountUpdate.diagram
-        <businessObjects href="bankAccountUpdate.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.4"/>
-========
-        <businessObjects href="lock.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.5"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Transaction/lock.diagram
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="500" height="60" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Composition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="nameText"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-<<<<<<<< HEAD:BankAccountCorC/src/Account/bankAccountUpdate.diagram
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="100" y="80" horizontalAlignment="ALIGNMENT_CENTER" value="{newBalance = balance + x}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="pre1NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="bankAccountUpdate.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="100" x="250" y="80" horizontalAlignment="ALIGNMENT_CENTER" value="{(\result = FALSE -> balance = \old(balance)) &amp; (\result = TRUE -> balance = \old(balance) + x)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="post2NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="bankAccountUpdate.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="480" y="10" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="bankAccountUpdate.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-========
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="100" y="80" horizontalAlignment="ALIGNMENT_CENTER" value="{intermediateCond}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="pre1NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="lock.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="100" x="250" y="80" horizontalAlignment="ALIGNMENT_CENTER" value="{post}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="post2NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="lock.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="480" y="10" id="de.tu_bs.cs.isf.cbc.tool.unproven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="lock.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
->>>>>>>> master:Banking-Evaluation/diagrams/Transaction/lock.diagram
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" y="60" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" x="250" y="60" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="166" height="20" y="180" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement 1">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement1Header"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="166" height="20" x="332" y="180" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement 2">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement2Header"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="166" height="20" x="166" y="180" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="intermediate condition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="intermediateCondHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-        <points y="60"/>
-        <points x="500" y="60"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor2Line"/>
-        <points y="80"/>
-        <points x="500" y="80"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor3Line"/>
-        <points y="180"/>
-        <points x="500" y="180"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor4Line"/>
-        <points y="200"/>
-        <points x="500" y="200"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver1Line"/>
-        <points x="250" y="60"/>
-        <points x="250" y="180"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver2Line"/>
-        <points x="166" y="180"/>
-        <points x="166" y="300"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver3Line"/>
-        <points x="332" y="180"/>
-        <points x="332" y="300"/>
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-<<<<<<<< HEAD:BankAccountCorC/src/Account/bankAccountUpdate.diagram
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="200" height="300" x="360" y="1030" cornerHeight="20" cornerWidth="20">
-========
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.3" lineWidth="2" filled="true" transparency="0.0" width="250" height="300" x="370" y="710" cornerHeight="20" cornerWidth="20">
->>>>>>>> master:Banking-Evaluation/diagrams/Transaction/lock.diagram
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-<<<<<<<< HEAD:BankAccountCorC/src/Account/bankAccountUpdate.diagram
-      <businessObjects href="bankAccountUpdate.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.2"/>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="200" height="40" horizontalAlignment="ALIGNMENT_CENTER" value="SelectionStatement IF..FI">
-========
-      <businessObjects href="lock.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.1"/>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="40" horizontalAlignment="ALIGNMENT_CENTER" value="SelectionStatement IF..FI">
->>>>>>>> master:Banking-Evaluation/diagrams/Transaction/lock.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="nameText"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-<<<<<<<< HEAD:BankAccountCorC/src/Account/bankAccountUpdate.diagram
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="180" y="10" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="bankAccountUpdate.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="20" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="guards">
-========
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="230" y="10" id="de.tu_bs.cs.isf.cbc.tool.unproven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="lock.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="guards">
->>>>>>>> master:Banking-Evaluation/diagrams/Transaction/lock.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="guardHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-<<<<<<<< HEAD:BankAccountCorC/src/Account/bankAccountUpdate.diagram
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="20" y="105" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-========
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" y="105" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
->>>>>>>> master:Banking-Evaluation/diagrams/Transaction/lock.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-<<<<<<<< HEAD:BankAccountCorC/src/Account/bankAccountUpdate.diagram
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="20" y="170" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statements">
-========
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" y="170" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statements">
->>>>>>>> master:Banking-Evaluation/diagrams/Transaction/lock.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-<<<<<<<< HEAD:BankAccountCorC/src/Account/bankAccountUpdate.diagram
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="20" y="235" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-========
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" y="235" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
->>>>>>>> master:Banking-Evaluation/diagrams/Transaction/lock.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-        <points y="40"/>
-<<<<<<<< HEAD:BankAccountCorC/src/Account/bankAccountUpdate.diagram
-        <points x="200" y="40"/>
-========
-        <points x="250" y="40"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Transaction/lock.diagram
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor2Line"/>
-        <points y="60"/>
-<<<<<<<< HEAD:BankAccountCorC/src/Account/bankAccountUpdate.diagram
-        <points x="200" y="60"/>
-========
-        <points x="250" y="60"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Transaction/lock.diagram
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor3Line"/>
-        <points y="105"/>
-<<<<<<<< HEAD:BankAccountCorC/src/Account/bankAccountUpdate.diagram
-        <points x="200" y="105"/>
-========
-        <points x="250" y="105"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Transaction/lock.diagram
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor4Line"/>
-        <points y="125"/>
-<<<<<<<< HEAD:BankAccountCorC/src/Account/bankAccountUpdate.diagram
-        <points x="200" y="125"/>
-========
-        <points x="250" y="125"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Transaction/lock.diagram
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor5Line"/>
-        <points y="170"/>
-<<<<<<<< HEAD:BankAccountCorC/src/Account/bankAccountUpdate.diagram
-        <points x="200" y="170"/>
-========
-        <points x="250" y="170"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Transaction/lock.diagram
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor6Line"/>
-        <points y="190"/>
-<<<<<<<< HEAD:BankAccountCorC/src/Account/bankAccountUpdate.diagram
-        <points x="200" y="190"/>
-========
-        <points x="250" y="190"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Transaction/lock.diagram
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor7Line"/>
-        <points y="235"/>
-<<<<<<<< HEAD:BankAccountCorC/src/Account/bankAccountUpdate.diagram
-        <points x="200" y="235"/>
-========
-        <points x="250" y="235"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Transaction/lock.diagram
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor8Line"/>
-        <points y="255"/>
-<<<<<<<< HEAD:BankAccountCorC/src/Account/bankAccountUpdate.diagram
-        <points x="200" y="255"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="45" y="190" horizontalAlignment="ALIGNMENT_CENTER" value="statement1">
-========
-        <points x="250" y="255"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="45" y="190" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
->>>>>>>> master:Banking-Evaluation/diagrams/Transaction/lock.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementSelNameText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-<<<<<<<< HEAD:BankAccountCorC/src/Account/bankAccountUpdate.diagram
-        <businessObjects href="bankAccountUpdate.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.3"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="45" y="125" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(\nothing);(newBalance = balance + x) &amp; (newBalance &lt; this.OVERDRAFT_LIMIT)}">
-========
-        <businessObjects href="lock.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement/@commands.0"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.2"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="45" y="125" horizontalAlignment="ALIGNMENT_CENTER" value="{(pre) &amp; (source.isLocked())}">
->>>>>>>> master:Banking-Evaluation/diagrams/Transaction/lock.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-<<<<<<<< HEAD:BankAccountCorC/src/Account/bankAccountUpdate.diagram
-        <businessObjects href="bankAccountUpdate.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="200" height="45" y="255" horizontalAlignment="ALIGNMENT_CENTER" value="{(result = FALSE -> balance = \old(balance)) &amp; (result = TRUE -> balance = \old(balance) + x)}">
-========
-        <businessObjects href="lock.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement/@commands.0/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="45" y="255" horizontalAlignment="ALIGNMENT_CENTER" value="{intermediateCond}">
->>>>>>>> master:Banking-Evaluation/diagrams/Transaction/lock.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-<<<<<<<< HEAD:BankAccountCorC/src/Account/bankAccountUpdate.diagram
-        <businessObjects href="bankAccountUpdate.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@postCondition"/>
-========
-        <businessObjects href="lock.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement/@commands.0/@postCondition"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Transaction/lock.diagram
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver1Line"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver2Line"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver3Line"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-    </children>
-<<<<<<<< HEAD:BankAccountCorC/src/Account/bankAccountUpdate.diagram
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="45" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="newBalance &lt; this.OVERDRAFT_LIMIT">
-========
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver4Line"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="45" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="source.isLocked()">
->>>>>>>> master:Banking-Evaluation/diagrams/Transaction/lock.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="conditionSelText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-<<<<<<<< HEAD:BankAccountCorC/src/Account/bankAccountUpdate.diagram
-        <businessObjects href="bankAccountUpdate.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@guards.0"/>
-========
-        <businessObjects href="lock.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement/@guards.0"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Transaction/lock.diagram
-      </link>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.3" lineWidth="2" filled="true" transparency="0.0" width="250" height="300" x="880" y="1120" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="lock.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.4"/>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="40" horizontalAlignment="ALIGNMENT_CENTER" value="SelectionStatement IF..FI">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="nameText"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="230" y="10" id="de.tu_bs.cs.isf.cbc.tool.unproven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="lock.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="guards">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="guardHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" y="105" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" y="170" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statements">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" y="235" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-        <points y="40"/>
-        <points x="250" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor2Line"/>
-        <points y="60"/>
-        <points x="250" y="60"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor3Line"/>
-        <points y="105"/>
-        <points x="250" y="105"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor4Line"/>
-        <points y="125"/>
-        <points x="250" y="125"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor5Line"/>
-        <points y="170"/>
-        <points x="250" y="170"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor6Line"/>
-        <points y="190"/>
-        <points x="250" y="190"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor7Line"/>
-        <points y="235"/>
-        <points x="250" y="235"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor8Line"/>
-        <points y="255"/>
-        <points x="250" y="255"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true" active="true">
-<<<<<<<< HEAD:BankAccountCorC/src/Account/bankAccountUpdate.diagram
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="45" x="100" y="190" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
-========
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="45" y="190" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
->>>>>>>> master:Banking-Evaluation/diagrams/Transaction/lock.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementSelNameText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-<<<<<<<< HEAD:BankAccountCorC/src/Account/bankAccountUpdate.diagram
-        <businessObjects href="bankAccountUpdate.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.1"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.5"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="45" x="100" y="125" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(\nothing);(newBalance = balance + x) &amp; (newBalance >= this.OVERDRAFT_LIMIT)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="bankAccountUpdate.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.1/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" horizontalAlignment="ALIGNMENT_CENTER" value="{(result = FALSE -> balance = \old(balance)) &amp; (result = TRUE -> balance = \old(balance) + x)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="bankAccountUpdate.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.1/@postCondition"/>
-========
-        <businessObjects href="lock.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.6"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="45" y="125" horizontalAlignment="ALIGNMENT_CENTER" value="{(intermediateCond) &amp; (destination.isLocked())}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="lock.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="45" y="255" horizontalAlignment="ALIGNMENT_CENTER" value="{intermediateCond}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="lock.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@postCondition"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Transaction/lock.diagram
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver1Line"/>
-<<<<<<<< HEAD:BankAccountCorC/src/Account/bankAccountUpdate.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-        <points x="100" y="60"/>
-        <points x="100" y="105"/>
-========
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Transaction/lock.diagram
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver2Line"/>
-<<<<<<<< HEAD:BankAccountCorC/src/Account/bankAccountUpdate.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-        <points x="100" y="125"/>
-        <points x="100" y="170"/>
-========
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Transaction/lock.diagram
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver3Line"/>
-<<<<<<<< HEAD:BankAccountCorC/src/Account/bankAccountUpdate.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-        <points x="100" y="190"/>
-        <points x="100" y="235"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="45" x="100" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="newBalance >= this.OVERDRAFT_LIMIT">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="conditionSelText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="bankAccountUpdate.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@guards.1"/>
-      </link>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="300" height="100" x="110" y="1390" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="bankAccountUpdate.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.3"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="100" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="result = false;">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="bankAccountUpdate.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(\nothing);(newBalance = balance + x) &amp; (newBalance &lt; this.OVERDRAFT_LIMIT)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="bankAccountUpdate.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="200" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{(result = FALSE -> balance = \old(balance)) &amp; (result = TRUE -> balance = \old(balance) + x)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="bankAccountUpdate.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="280" y="10" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="bankAccountUpdate.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="100" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="200" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerSeparater"/>
-        <points y="40"/>
-        <points x="300" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preSep"/>
-        <points x="200"/>
-        <points x="200" y="100"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postSep"/>
-        <points x="100"/>
-        <points x="100" y="100"/>
-      </graphicsAlgorithm>
-========
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver4Line"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="45" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="destination.isLocked()">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="conditionSelText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="lock.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@guards.0"/>
-      </link>
->>>>>>>> master:Banking-Evaluation/diagrams/Transaction/lock.diagram
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-<<<<<<<< HEAD:BankAccountCorC/src/Account/bankAccountUpdate.diagram
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="300" height="100" x="510" y="1420" cornerHeight="20" cornerWidth="20">
-========
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.3" lineWidth="2" filled="true" transparency="0.0" width="510" height="251" x="1360" y="1130" cornerHeight="20" cornerWidth="20">
->>>>>>>> master:Banking-Evaluation/diagrams/Transaction/lock.diagram
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-<<<<<<<< HEAD:BankAccountCorC/src/Account/bankAccountUpdate.diagram
-      <businessObjects href="bankAccountUpdate.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.1/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.5"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="100" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="balance = newBalance;&#xD;&#xA;result = true;">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="bankAccountUpdate.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.1/@refinement"/>
-========
-      <businessObjects href="lock.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.5"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="170" height="211" x="170" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="source.lock();&#xD;&#xA;destination.lock();&#xD;&#xA;return true;">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="lock.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Transaction/lock.diagram
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-<<<<<<<< HEAD:BankAccountCorC/src/Account/bankAccountUpdate.diagram
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(\nothing);(newBalance = balance + x) &amp; (newBalance >= this.OVERDRAFT_LIMIT)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="bankAccountUpdate.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.1/@refinement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="200" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{(result = FALSE -> balance = \old(balance)) &amp; (result = TRUE -> balance = \old(balance) + x)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="bankAccountUpdate.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.1/@refinement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="280" y="10" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="bankAccountUpdate.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.1/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="100" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
-========
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="170" height="211" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{intermediateCond}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="lock.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="170" height="211" x="340" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{post}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="lock.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="490" y="10" id="de.tu_bs.cs.isf.cbc.tool.unproven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="lock.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="170" height="20" x="170" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
->>>>>>>> master:Banking-Evaluation/diagrams/Transaction/lock.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-<<<<<<<< HEAD:BankAccountCorC/src/Account/bankAccountUpdate.diagram
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-========
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="170" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
->>>>>>>> master:Banking-Evaluation/diagrams/Transaction/lock.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-<<<<<<<< HEAD:BankAccountCorC/src/Account/bankAccountUpdate.diagram
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="200" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-========
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="170" height="20" x="340" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
->>>>>>>> master:Banking-Evaluation/diagrams/Transaction/lock.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerSeparater"/>
-        <points y="40"/>
-<<<<<<<< HEAD:BankAccountCorC/src/Account/bankAccountUpdate.diagram
-        <points x="300" y="40"/>
-========
-        <points x="510" y="40"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Transaction/lock.diagram
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preSep"/>
-<<<<<<<< HEAD:BankAccountCorC/src/Account/bankAccountUpdate.diagram
-        <points x="200"/>
-        <points x="200" y="100"/>
-========
-        <points x="340"/>
-        <points x="340" y="251"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Transaction/lock.diagram
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postSep"/>
-<<<<<<<< HEAD:BankAccountCorC/src/Account/bankAccountUpdate.diagram
-        <points x="100"/>
-        <points x="100" y="100"/>
-========
-        <points x="170"/>
-        <points x="170" y="251"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Transaction/lock.diagram
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-<<<<<<<< HEAD:BankAccountCorC/src/Account/bankAccountUpdate.diagram
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="300" height="100" x="760" y="1030" cornerHeight="20" cornerWidth="20">
-========
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.3" lineWidth="2" filled="true" transparency="0.0" width="300" height="100" x="250" y="1070" cornerHeight="20" cornerWidth="20">
->>>>>>>> master:Banking-Evaluation/diagrams/Transaction/lock.diagram
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-<<<<<<<< HEAD:BankAccountCorC/src/Account/bankAccountUpdate.diagram
-      <businessObjects href="bankAccountUpdate.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement"/>
-========
-      <businessObjects href="lock.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement/@commands.0/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.2"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="100" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="return false;">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="lock.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement/@commands.0/@refinement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{(pre) &amp; (source.isLocked())}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="lock.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement/@commands.0/@refinement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="200" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{intermediateCond}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="lock.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement/@commands.0/@refinement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="280" y="10" id="de.tu_bs.cs.isf.cbc.tool.unproven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="lock.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement/@commands.0/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="100" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="200" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerSeparater"/>
-        <points y="40"/>
-        <points x="300" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preSep"/>
-        <points x="200"/>
-        <points x="200" y="100"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postSep"/>
-        <points x="100"/>
-        <points x="100" y="100"/>
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.3" lineWidth="2" filled="true" transparency="0.0" width="300" height="100" x="840" y="1480" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="lock.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Transaction/lock.diagram
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.4"/>
-    <children visible="true" active="true">
-<<<<<<<< HEAD:BankAccountCorC/src/Account/bankAccountUpdate.diagram
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="100" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="result;">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="bankAccountUpdate.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement"/>
-========
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="100" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="return false;">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="lock.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement"/>
->>>>>>>> master:Banking-Evaluation/diagrams/Transaction/lock.diagram
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-<<<<<<<< HEAD:BankAccountCorC/src/Account/bankAccountUpdate.diagram
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{(result = FALSE -> balance = \old(balance)) &amp; (result = TRUE -> balance = \old(balance) + x)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="bankAccountUpdate.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="200" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{(\result = FALSE -> balance = \old(balance)) &amp; (\result = TRUE -> balance = \old(balance) + x)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="bankAccountUpdate.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="280" y="10" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="bankAccountUpdate.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="100" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="ReturnStatement">
-========
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{(intermediateCond) &amp; (destination.isLocked())}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="lock.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="200" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{intermediateCond}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="lock.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="280" y="10" id="de.tu_bs.cs.isf.cbc.tool.unproven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="lock.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="100" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
->>>>>>>> master:Banking-Evaluation/diagrams/Transaction/lock.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="200" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerSeparater"/>
-        <points y="40"/>
-        <points x="300" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preSep"/>
-        <points x="200"/>
-        <points x="200" y="100"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postSep"/>
-        <points x="100"/>
-        <points x="100" y="100"/>
-      </graphicsAlgorithm>
-    </children>
-  </children>
-<<<<<<<< HEAD:BankAccountCorC/src/Account/bankAccountUpdate.diagram
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" lineWidth="1" filled="true" transparency="0.0" width="351" height="341" x="1270" y="60" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="bankAccountUpdate.cbcmodel#/1"/>
-    </link>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="351" height="26" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Variables">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variablesName"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="bankAccountUpdate.cbcmodel#/1"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-        <points y="26"/>
-        <points x="351" y="26"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="351" height="26" y="26" horizontalAlignment="ALIGNMENT_CENTER" value="PUBLIC int OVERDRAFT_LIMIT">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Account.cbcclass#//@fields.0"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="351" height="26" y="52" horizontalAlignment="ALIGNMENT_CENTER" value="PUBLIC static int INTEREST_RATE">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Account.cbcclass#//@fields.1"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="351" height="26" y="78" horizontalAlignment="ALIGNMENT_CENTER" value="PUBLIC static int DAILY_LIMIT">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="2"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Account.cbcclass#//@fields.2"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="351" height="26" y="104" horizontalAlignment="ALIGNMENT_CENTER" value="PUBLIC int balance">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="3"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Account.cbcclass#//@fields.3"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="351" height="26" y="130" horizontalAlignment="ALIGNMENT_CENTER" value="PUBLIC int withdraw">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="4"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Account.cbcclass#//@fields.4"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="351" height="26" y="156" horizontalAlignment="ALIGNMENT_CENTER" value="PUBLIC int interest">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="5"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Account.cbcclass#//@fields.5"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="351" height="26" y="182" horizontalAlignment="ALIGNMENT_CENTER" value="PUBLIC boolean lock">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="6"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Account.cbcclass#//@fields.6"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="351" height="26" y="208" horizontalAlignment="ALIGNMENT_CENTER" value="PARAM int x">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="7"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="bankAccountUpdate.cbcmodel#/1/@variables.0"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="351" height="26" y="234" horizontalAlignment="ALIGNMENT_CENTER" value="RETURN boolean result">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="8"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="bankAccountUpdate.cbcmodel#/1/@variables.1"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="351" height="26" y="260" horizontalAlignment="ALIGNMENT_CENTER" value="LOCAL int old_balance">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="9"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="bankAccountUpdate.cbcmodel#/1/@variables.2"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="351" height="26" y="286" horizontalAlignment="ALIGNMENT_CENTER" value="LOCAL int newBalance">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="10"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="bankAccountUpdate.cbcmodel#/1/@variables.3"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="351" height="26" y="312" horizontalAlignment="ALIGNMENT_CENTER" value="LOCAL boolean result">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="11"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="bankAccountUpdate.cbcmodel#/1/@variables.4"/>
-      </link>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" lineWidth="1" filled="true" transparency="0.0" width="200" height="100" x="1350" y="471" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="bankAccountUpdate.cbcmodel#/2"/>
-    </link>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="50" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Global Conditions">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="globalConditionsName"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="bankAccountUpdate.cbcmodel#/2"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-        <points y="50"/>
-        <points x="200" y="50"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="200" height="50" y="50" horizontalAlignment="ALIGNMENT_CENTER" value="OVERDRAFT_LIMIT = 0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="globalcondition"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="bankAccountUpdate.cbcmodel#/2/@conditions.0"/>
-      </link>
-    </children>
-  </children>
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.1/@children.0/@anchors.0" end="//@children.2/@anchors.0">
-========
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@children.1/@anchors.0" end="//@children.3/@anchors.0">
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.3/@children.0/@anchors.0" end="//@children.5/@anchors.0">
->>>>>>>> master:Banking-Evaluation/diagrams/Transaction/lock.diagram
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.5/@children.14/@anchors.0" end="//@children.8/@anchors.0">
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.3/@children.2/@anchors.0" end="//@children.4/@anchors.0">
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.4/@children.0/@anchors.0" end="//@children.6/@anchors.0">
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-<<<<<<<< HEAD:BankAccountCorC/src/Account/bankAccountUpdate.diagram
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.3/@children.2/@anchors.0" end="//@children.7/@anchors.0">
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.4/@children.21/@anchors.0" end="//@children.6/@anchors.0">
-========
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.4/@children.2/@anchors.0" end="//@children.7/@anchors.0">
->>>>>>>> master:Banking-Evaluation/diagrams/Transaction/lock.diagram
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-<<<<<<<< HEAD:BankAccountCorC/src/Account/bankAccountUpdate.diagram
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@children.1/@anchors.0" end="//@children.1/@anchors.0">
-========
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.6/@children.14/@anchors.0" end="//@children.9/@anchors.0">
->>>>>>>> master:Banking-Evaluation/diagrams/Transaction/lock.diagram
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-  <colors red="227" green="238" blue="249"/>
-  <colors red="255" green="255" blue="255"/>
-  <colors green="127"/>
-  <colors red="255"/>
-  <colors/>
-  <fonts name="Arial" size="9" bold="true"/>
-</pi:Diagram>
diff --git a/Elevator/features/Base/Elevator/Elevator.diagram.orig b/Elevator/features/Base/Elevator/Elevator.diagram.orig
deleted file mode 100644
index b71df4228..000000000
--- a/Elevator/features/Base/Elevator/Elevator.diagram.orig
+++ /dev/null
@@ -1,4039 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<<<<<<<< HEAD:EmailCorC/src/Client/getClientByAdress.diagram
-<pi:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:al="http://eclipse.org/graphiti/mm/algorithms" xmlns:pi="http://eclipse.org/graphiti/mm/pictograms" visible="true" gridUnit="10" diagramTypeId="cbc" name="getClientByAdress" snapToGrid="true" pictogramLinks="//@children.0/@link //@link //@children.0/@children.0/@link //@children.0/@children.1/@link //@children.0/@children.2/@link //@children.0/@children.4/@link //@children.1/@link //@children.1/@children.1/@link //@children.1/@children.0/@link //@children.1/@children.2/@link //@children.1/@children.4/@link //@children.1/@children.5/@link //@children.1/@children.6/@link //@children.2/@link //@children.2/@children.0/@link //@children.2/@children.1/@link //@children.2/@children.2/@link //@children.2/@children.3/@link //@children.3/@link //@children.3/@children.1/@link //@children.3/@children.0/@link //@children.3/@children.2/@link //@children.3/@children.4/@link //@children.3/@children.5/@link //@children.3/@children.6/@link //@children.4/@link //@children.4/@children.1/@link //@children.4/@children.0/@link //@children.4/@children.3/@link //@children.4/@children.2/@link //@children.4/@children.5/@link //@children.4/@children.6/@link //@children.4/@children.7/@link //@children.5/@link //@children.5/@children.1/@link //@children.5/@children.0/@link //@children.5/@children.2/@link //@children.5/@children.4/@link //@children.5/@children.5/@link //@children.5/@children.6/@link //@children.6/@link //@children.6/@children.1/@link //@children.6/@children.14/@link //@children.6/@children.15/@link //@children.6/@children.16/@link //@children.6/@children.20/@link //@children.6/@children.21/@link //@children.6/@children.22/@link //@children.6/@children.23/@link //@children.6/@children.27/@link //@children.7/@link //@children.7/@children.0/@link //@children.7/@children.1/@link //@children.7/@children.2/@link //@children.7/@children.3/@link //@children.8/@link //@children.8/@children.0/@link //@children.8/@children.1/@link //@children.8/@children.2/@link //@children.8/@children.3/@link //@children.9/@link //@children.9/@children.0/@link //@children.9/@children.1/@link //@children.9/@children.2/@link //@children.9/@children.3/@link //@children.10/@link //@children.10/@children.0/@link //@children.10/@children.2/@link //@children.10/@children.3/@link //@children.10/@children.4/@link //@children.10/@children.5/@link //@children.10/@children.6/@link //@children.10/@children.7/@link //@children.10/@children.8/@link //@children.10/@children.9/@link //@children.10/@children.10/@link //@children.11/@link //@children.11/@children.0/@link //@children.12/@link //@children.12/@children.0/@link //@children.12/@children.1/@link //@children.12/@children.2/@link //@children.12/@children.3/@link //@children.11/@children.2/@link" version="0.18.0">
-========
-<pi:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:al="http://eclipse.org/graphiti/mm/algorithms" xmlns:pi="http://eclipse.org/graphiti/mm/pictograms" visible="true" gridUnit="10" diagramTypeId="cbcclass" name="Elevator" snapToGrid="true" pictogramLinks="//@children.0/@link //@children.0/@children.1/@link //@children.0/@children.0/@link //@children.0/@children.8/@link //@children.0/@children.9/@link //@children.0/@children.10/@link //@children.0/@children.11/@link //@children.0/@children.12/@link //@children.0/@children.13/@link //@children.0/@children.14/@link //@children.0/@children.15/@link //@children.0/@children.16/@link //@children.0/@children.17/@link //@children.0/@children.18/@link //@children.0/@children.19/@link //@children.1/@link //@children.1/@children.0/@link //@children.1/@children.2/@link //@children.1/@children.1/@link //@children.1/@children.3/@link //@children.1/@children.12/@link //@children.2/@link //@children.2/@children.0/@link //@children.2/@children.2/@link //@children.2/@children.1/@link //@children.2/@children.3/@link //@children.2/@children.12/@link //@children.3/@link //@children.3/@children.0/@link //@children.3/@children.2/@link //@children.3/@children.1/@link //@children.3/@children.3/@link //@children.3/@children.12/@link //@children.4/@link //@children.4/@children.0/@link //@children.4/@children.2/@link //@children.4/@children.1/@link //@children.4/@children.3/@link //@children.4/@children.12/@link //@children.5/@link //@children.5/@children.0/@link //@children.5/@children.2/@link //@children.5/@children.1/@link //@children.5/@children.3/@link //@children.5/@children.12/@link //@children.6/@link //@children.6/@children.0/@link //@children.6/@children.2/@link //@children.6/@children.1/@link //@children.6/@children.3/@link //@children.6/@children.12/@link //@children.7/@link //@children.7/@children.0/@link //@children.7/@children.2/@link //@children.7/@children.1/@link //@children.7/@children.3/@link //@children.7/@children.12/@link //@children.8/@link //@children.8/@children.0/@link //@children.8/@children.2/@link //@children.8/@children.1/@link //@children.8/@children.3/@link //@children.8/@children.12/@link //@children.9/@link //@children.9/@children.0/@link //@children.9/@children.2/@link //@children.9/@children.1/@link //@children.9/@children.3/@link //@children.9/@children.12/@link //@children.10/@link //@children.10/@children.0/@link //@children.10/@children.2/@link //@children.10/@children.1/@link //@children.10/@children.3/@link //@children.10/@children.12/@link //@children.11/@link //@children.11/@children.0/@link //@children.11/@children.2/@link //@children.11/@children.1/@link //@children.11/@children.3/@link //@children.11/@children.12/@link //@children.12/@link //@children.12/@children.0/@link //@children.12/@children.2/@link //@children.12/@children.1/@link //@children.12/@children.3/@link //@children.12/@children.12/@link //@children.13/@link //@children.13/@children.0/@link //@children.13/@children.2/@link //@children.13/@children.1/@link //@children.13/@children.3/@link //@children.13/@children.12/@link //@children.14/@link //@children.14/@children.0/@link //@children.14/@children.2/@link //@children.14/@children.1/@link //@children.14/@children.3/@link //@children.14/@children.12/@link" version="0.18.0">
->>>>>>>> master:Elevator/features/Base/Elevator/Elevator.diagram
-  <graphicsAlgorithm xsi:type="al:Rectangle" background="//@colors.1" foreground="//@colors.0" lineWidth="1" transparency="0.0" width="1000" height="1000"/>
-  <link>
-    <businessObjects href="getClientByAdress.cbcmodel#/0"/>
-  </link>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-<<<<<<<< HEAD:EmailCorC/src/Client/getClientByAdress.diagram
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="901" height="291" x="20" y="20" cornerHeight="20" cornerWidth="20">
-========
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" lineWidth="1" filled="true" transparency="0.0" width="350" height="531" x="230" y="100" cornerHeight="20" cornerWidth="20">
->>>>>>>> master:Elevator/features/Base/Elevator/Elevator.diagram
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-<<<<<<<< HEAD:EmailCorC/src/Client/getClientByAdress.diagram
-      <businessObjects href="getClientByAdress.cbcmodel#/0"/>
-    </link>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="300" height="231" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="{ Client.clients != null}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="300" height="231" x="300" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementNameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/0/@statement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.0"/>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="300" height="231" x="600" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(index,result);&#xD;&#xA;(\exists int k;((k>=0 &amp; k&lt;Client.clients.length  &#xD;&#xA;&amp; Client.clients[k].getName() != null &#xD;&#xA;&amp; Client.clients[k].getName().equals(address) = TRUE) -> result = Client.clients[k]))}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="901" height="30" y="5" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Formula">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="nameText"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="881" y="10" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/0"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="300" height="20" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="300" height="20" x="600" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="300" height="20" x="300" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="stHeader"/>
-========
-      <businessObjects href="Elevator.cbcclass#/"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.0 //@connections.1 //@connections.2 //@connections.3 //@connections.4 //@connections.5 //@connections.6 //@connections.7 //@connections.8 //@connections.9 //@connections.10 //@connections.11 //@connections.12 //@connections.13"/>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="330" y="10" id="de.tu_bs.cs.isf.cbc.tool.unproven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#/"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="350" height="30" y="5" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Elevator">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="nameText"/>
->>>>>>>> master:Elevator/features/Base/Elevator/Elevator.diagram
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#/"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-        <points y="40"/>
-<<<<<<<< HEAD:EmailCorC/src/Client/getClientByAdress.diagram
-        <points x="901" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor2Line"/>
-        <points y="60"/>
-        <points x="901" y="60"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver1Line"/>
-        <points x="300" y="40"/>
-        <points x="300" y="291"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver2Line"/>
-        <points x="600" y="40"/>
-        <points x="600" y="291"/>
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="710" height="431" x="140" y="340" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.0"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="236" height="165" y="266" horizontalAlignment="ALIGNMENT_CENTER" value="statement1">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement1NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@firstStatement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.1"/>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="236" height="165" x="236" y="266" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(index,result);&#xD;&#xA;index = 0&#xD;&#xA;&amp; Client.clients.&lt;created> = TRUE&#xD;&#xA;&amp; Client.clients.length >= 0&#xD;&#xA;&amp; Client.clients != null}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="conditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@intermediateCondition"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="236" height="165" x="472" y="266" horizontalAlignment="ALIGNMENT_CENTER" value="statement2">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement2NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@secondStatement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.2"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="710" height="60" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Composition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="nameText"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="355" height="165" y="80" horizontalAlignment="ALIGNMENT_CENTER" value="{ Client.clients != null}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="pre1NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@firstStatement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="355" height="165" x="355" y="80" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(index,result);&#xD;&#xA;(\exists int k;((k>=0 &amp; k&lt;Client.clients.length  &#xD;&#xA;&amp; Client.clients[k].getName() != null &#xD;&#xA;&amp; Client.clients[k].getName().equals(address) = TRUE) -> result = Client.clients[k]))}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="post2NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@secondStatement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="690" y="10" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="355" height="20" y="60" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="355" height="20" x="355" y="60" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="236" height="20" y="246" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement 1">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement1Header"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="236" height="20" x="472" y="246" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement 2">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement2Header"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="236" height="20" x="236" y="246" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="intermediate condition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="intermediateCondHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-        <points y="60"/>
-        <points x="710" y="60"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor2Line"/>
-        <points y="80"/>
-        <points x="710" y="80"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor3Line"/>
-        <points y="246"/>
-        <points x="710" y="246"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor4Line"/>
-        <points y="266"/>
-        <points x="710" y="266"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver1Line"/>
-        <points x="355" y="60"/>
-        <points x="355" y="246"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver2Line"/>
-        <points x="236" y="246"/>
-        <points x="236" y="431"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver3Line"/>
-        <points x="472" y="246"/>
-        <points x="472" y="431"/>
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="621" height="331" y="860" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.1"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="207" height="291" x="207" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="index = 0;&#xD;&#xA;result = null;">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="207" height="291" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{ Client.clients != null}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="207" height="291" x="414" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(index,result);&#xD;&#xA;index = 0&#xD;&#xA;&amp; Client.clients.&lt;created> = TRUE&#xD;&#xA;&amp; Client.clients.length >= 0&#xD;&#xA;&amp; Client.clients != null}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="601" y="10" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="207" height="20" x="207" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="207" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="207" height="20" x="414" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerSeparater"/>
-        <points y="40"/>
-        <points x="621" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preSep"/>
-        <points x="414"/>
-        <points x="414" y="331"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postSep"/>
-        <points x="207"/>
-        <points x="207" y="331"/>
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="791" height="461" x="950" y="460" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.2"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="263" height="180" y="281" horizontalAlignment="ALIGNMENT_CENTER" value="statement1">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement1NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.8"/>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="263" height="180" x="263" y="281" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(index,result);&#xD;&#xA;(\exists int k;((k>=0 &amp; k&lt;Client.clients.length &#xD;&#xA;&amp; Client.clients[k].getName() != null&#xD;&#xA;&amp; Client.clients[k].getName().equals(address) = TRUE) -> result = Client.clients[k]))}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="conditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@intermediateCondition"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="263" height="180" x="526" y="281" horizontalAlignment="ALIGNMENT_CENTER" value="statement2">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement2NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.9"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="791" height="60" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Composition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="nameText"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="395" height="180" y="80" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(index,result);&#xD;&#xA;index = 0&#xD;&#xA;&amp; Client.clients.&lt;created> = TRUE&#xD;&#xA;&amp; Client.clients.length >= 0&#xD;&#xA;&amp; Client.clients != null}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="pre1NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="395" height="180" x="395" y="80" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(index,result);&#xD;&#xA;(\exists int k;((k>=0 &amp; k&lt;Client.clients.length  &#xD;&#xA;&amp; Client.clients[k].getName() != null &#xD;&#xA;&amp; Client.clients[k].getName().equals(address) = TRUE) -> result = Client.clients[k]))}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="post2NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="771" y="10" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="395" height="20" y="60" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="395" height="20" x="395" y="60" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="263" height="20" y="261" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement 1">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement1Header"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="263" height="20" x="526" y="261" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement 2">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement2Header"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="263" height="20" x="263" y="261" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="intermediate condition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="intermediateCondHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-        <points y="60"/>
-        <points x="791" y="60"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor2Line"/>
-        <points y="80"/>
-        <points x="791" y="80"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor3Line"/>
-        <points y="261"/>
-        <points x="791" y="261"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor4Line"/>
-        <points y="281"/>
-        <points x="791" y="281"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver1Line"/>
-        <points x="395" y="60"/>
-        <points x="395" y="261"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver2Line"/>
-        <points x="263" y="261"/>
-        <points x="263" y="461"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver3Line"/>
-        <points x="526" y="261"/>
-        <points x="526" y="461"/>
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="891" height="421" x="690" y="1070" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.8"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="297" height="160" x="297" y="261" horizontalAlignment="ALIGNMENT_CENTER" value="loop">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementRepNameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@loopStatement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.3"/>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="297" height="160" x="297" y="80" horizontalAlignment="ALIGNMENT_CENTER" value="index &lt; Client.clients.length">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="conditionRepText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@guard"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="297" height="160" y="80" horizontalAlignment="ALIGNMENT_CENTER" value="index >= 0 &amp;(\exists int k;(((k>=0 &amp; k&lt;index &amp; Client.clients[k].getName() != null&amp; Client.clients[k].getName().equals(address) = TRUE) -> result = Client.clients[k])))">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="invariantRepText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@invariant"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="297" height="160" x="594" y="80" horizontalAlignment="ALIGNMENT_CENTER" value="Client.clients.length - index">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variantRepText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@variant"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="891" height="60" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="RepetitionStatement DO...OD">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="nameText"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="297" height="160" y="261" horizontalAlignment="ALIGNMENT_CENTER" value="{(index >= 0 &amp;(\exists int k;(((k>=0 &amp; k&lt;index &amp; Client.clients[k].getName() != null&amp; Client.clients[k].getName().equals(address) = TRUE) -> result = Client.clients[k])))) &amp; (index &lt; Client.clients.length)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preNameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@loopStatement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="297" height="160" x="594" y="261" horizontalAlignment="ALIGNMENT_CENTER" value="{index >= 0 &amp;(\exists int k;(((k>=0 &amp; k&lt;index &amp; Client.clients[k].getName() != null&amp; Client.clients[k].getName().equals(address) = TRUE) -> result = Client.clients[k])))}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postNameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@loopStatement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="871" y="10" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="297" height="20" x="594" y="60" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="variant">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variantHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="297" height="20" y="60" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="invariant">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="invariantHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="297" height="20" x="297" y="60" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="guard">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="guardHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="297" height="20" x="297" y="241" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="loop statement">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="loopHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="297" height="20" x="594" y="241" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="297" height="20" y="241" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver1SEP"/>
-        <points x="297" y="60"/>
-        <points x="297" y="421"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver2SEP"/>
-        <points x="594" y="60"/>
-        <points x="594" y="421"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1SEP"/>
-        <points y="80"/>
-        <points x="891" y="80"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor2SEP"/>
-        <points y="60"/>
-        <points x="891" y="60"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor3SEP"/>
-        <points y="241"/>
-        <points x="891" y="241"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor4SEP"/>
-        <points y="261"/>
-        <points x="891" y="261"/>
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="500" height="300" x="620" y="1490" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@loopStatement/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.3"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="100" y="200" horizontalAlignment="ALIGNMENT_CENTER" value="statement1">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement1NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@loopStatement/@refinement/@firstStatement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.4"/>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="100" x="166" y="200" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(index,result);&#xD;&#xA;index >= 0 &amp;&#xD;&#xA;(\exists int k;((k>=0 &amp; k&lt;index &#xD;&#xA;&amp; Client.clients[k].getName().equals(address) = TRUE) -> result = Client.clients[k]))}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="conditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@loopStatement/@refinement/@intermediateCondition"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="100" x="332" y="200" horizontalAlignment="ALIGNMENT_CENTER" value="statement2">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement2NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@loopStatement/@refinement/@secondStatement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.7"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="500" height="60" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Composition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="nameText"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="100" y="80" horizontalAlignment="ALIGNMENT_CENTER" value="{(index >= 0 &amp;(\exists int k;(((k>=0 &amp; k&lt;index &amp; Client.clients[k].getName() != null&amp; Client.clients[k].getName().equals(address) = TRUE) -> result = Client.clients[k])))) &amp; (index &lt; Client.clients.length)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="pre1NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@loopStatement/@refinement/@firstStatement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="100" x="250" y="80" horizontalAlignment="ALIGNMENT_CENTER" value="{index >= 0 &amp;(\exists int k;(((k>=0 &amp; k&lt;index &amp; Client.clients[k].getName() != null&amp; Client.clients[k].getName().equals(address) = TRUE) -> result = Client.clients[k])))}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="post2NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@loopStatement/@refinement/@secondStatement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="480" y="10" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@loopStatement/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" y="60" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" x="250" y="60" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="166" height="20" y="180" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement 1">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement1Header"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="166" height="20" x="332" y="180" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement 2">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement2Header"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="166" height="20" x="166" y="180" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="intermediate condition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="intermediateCondHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-        <points y="60"/>
-        <points x="500" y="60"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor2Line"/>
-        <points y="80"/>
-        <points x="500" y="80"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor3Line"/>
-        <points y="180"/>
-        <points x="500" y="180"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor4Line"/>
-        <points y="200"/>
-        <points x="500" y="200"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver1Line"/>
-        <points x="250" y="60"/>
-        <points x="250" y="180"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver2Line"/>
-        <points x="166" y="180"/>
-        <points x="166" y="300"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver3Line"/>
-        <points x="332" y="180"/>
-        <points x="332" y="300"/>
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="410" height="410" x="60" y="1510" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@loopStatement/@refinement/@firstStatement/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.4"/>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="410" height="40" horizontalAlignment="ALIGNMENT_CENTER" value="SelectionStatement IF..FI">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="nameText"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="390" y="10" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@loopStatement/@refinement/@firstStatement/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="410" height="20" y="42" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="guards">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="guardHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="410" height="20" y="134" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="410" height="20" y="226" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statements">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="410" height="20" y="318" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-        <points y="42"/>
-        <points x="410" y="42"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor2Line"/>
-        <points y="62"/>
-        <points x="410" y="62"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor3Line"/>
-        <points y="134"/>
-        <points x="410" y="134"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor4Line"/>
-        <points y="154"/>
-        <points x="410" y="154"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor5Line"/>
-        <points y="226"/>
-        <points x="410" y="226"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor6Line"/>
-        <points y="246"/>
-        <points x="410" y="246"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor7Line"/>
-        <points y="318"/>
-        <points x="410" y="318"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor8Line"/>
-        <points y="338"/>
-        <points x="410" y="338"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="205" height="72" y="246" horizontalAlignment="ALIGNMENT_CENTER" value="statement1">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementSelNameText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@loopStatement/@refinement/@firstStatement/@refinement/@commands.0"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.5"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="205" height="72" y="154" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(\nothing);((index >= 0 &amp;(\exists int k;(((k>=0 &amp; k&lt;index &amp; Client.clients[k].getName() != null&amp; Client.clients[k].getName().equals(address) = TRUE) -> result = Client.clients[k])))) &amp; (index &lt; Client.clients.length)) &amp; (Client.clients[index] != null&amp;Client.clients[index].getName().equals(address) = TRUE)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@loopStatement/@refinement/@firstStatement/@refinement/@commands.0/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="410" height="72" y="338" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(index,result);&#xD;&#xA;index >= 0 &amp;&#xD;&#xA;(\exists int k;((k>=0 &amp; k&lt;index &#xD;&#xA;&amp; Client.clients[k].getName().equals(address) = TRUE) -> result = Client.clients[k]))}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@loopStatement/@refinement/@firstStatement/@refinement/@commands.0/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver1Line"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver2Line"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver3Line"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="205" height="72" y="62" horizontalAlignment="ALIGNMENT_CENTER" value="Client.clients[index] != null&amp;Client.clients[index].getName().equals(address) = TRUE">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="conditionSelText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@loopStatement/@refinement/@firstStatement/@refinement/@guards.0"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="205" height="72" x="205" y="246" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementSelNameText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@loopStatement/@refinement/@firstStatement/@refinement/@commands.1"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.6"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="205" height="72" x="205" y="154" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(\nothing);((index >= 0 &amp;(\exists int k;(((k>=0 &amp; k&lt;index &amp; Client.clients[k].getName() != null&amp; Client.clients[k].getName().equals(address) = TRUE) -> result = Client.clients[k])))) &amp; (index &lt; Client.clients.length)) &amp; (!(Client.clients[index] != null&amp;Client.clients[index].getName().equals(address) = TRUE))}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@loopStatement/@refinement/@firstStatement/@refinement/@commands.1/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(index,result);&#xD;&#xA;index >= 0 &amp;&#xD;&#xA;(\exists int k;((k>=0 &amp; k&lt;index &#xD;&#xA;&amp; Client.clients[k].getName().equals(address) = TRUE) -> result = Client.clients[k]))}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@loopStatement/@refinement/@firstStatement/@refinement/@commands.1/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver1Line"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-        <points x="205" y="62"/>
-        <points x="205" y="134"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver2Line"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-        <points x="205" y="154"/>
-        <points x="205" y="226"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver3Line"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-        <points x="205" y="246"/>
-        <points x="205" y="318"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="205" height="72" x="205" y="62" horizontalAlignment="ALIGNMENT_CENTER" value="!(Client.clients[index] != null&amp;Client.clients[index].getName().equals(address) = TRUE)">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="conditionSelText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@loopStatement/@refinement/@firstStatement/@refinement/@guards.1"/>
-      </link>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="411" height="191" x="100" y="1960" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@loopStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.5"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="137" height="151" x="137" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="result = Client.clients[index];">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@loopStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="137" height="151" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(\nothing);((index >= 0 &amp;(\exists int k;(((k>=0 &amp; k&lt;index &amp; Client.clients[k].getName() != null&amp; Client.clients[k].getName().equals(address) = TRUE) -> result = Client.clients[k])))) &amp; (index &lt; Client.clients.length)) &amp; (Client.clients[index] != null&amp;Client.clients[index].getName().equals(address) = TRUE)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@loopStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="137" height="151" x="274" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(index,result);&#xD;&#xA;index >= 0 &amp;&#xD;&#xA;(\exists int k;((k>=0 &amp; k&lt;index &#xD;&#xA;&amp; Client.clients[k].getName().equals(address) = TRUE) -> result = Client.clients[k]))}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@loopStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="391" y="10" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@loopStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="137" height="20" x="137" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="137" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="137" height="20" x="274" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerSeparater"/>
-        <points y="40"/>
-        <points x="411" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preSep"/>
-        <points x="274"/>
-        <points x="274" y="191"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postSep"/>
-        <points x="137"/>
-        <points x="137" y="191"/>
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="391" height="241" x="760" y="1890" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@loopStatement/@refinement/@firstStatement/@refinement/@commands.1/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.6"/>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="391" height="30" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Skip">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementNameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@loopStatement/@refinement/@firstStatement/@refinement/@commands.1/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="195" height="171" y="70" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(\nothing);((index >= 0 &amp;(\exists int k;(((k>=0 &amp; k&lt;index &amp; Client.clients[k].getName() != null&amp; Client.clients[k].getName().equals(address) = TRUE) -> result = Client.clients[k])))) &amp; (index &lt; Client.clients.length)) &amp; (!(Client.clients[index] != null&amp;Client.clients[index].getName().equals(address) = TRUE))}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preNameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@loopStatement/@refinement/@firstStatement/@refinement/@commands.1/@refinement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="195" height="171" x="195" y="70" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(index,result);&#xD;&#xA;index >= 0 &amp;&#xD;&#xA;(\exists int k;((k>=0 &amp; k&lt;index &#xD;&#xA;&amp; Client.clients[k].getName().equals(address) = TRUE) -> result = Client.clients[k]))}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postNameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@loopStatement/@refinement/@firstStatement/@refinement/@commands.1/@refinement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="371" y="10" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@loopStatement/@refinement/@firstStatement/@refinement/@commands.1/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="195" height="20" x="195" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="195" height="20" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="sepLeft"/>
-        <points x="195" y="40"/>
-        <points x="195" y="241"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="sepRight"/>
-        <points x="390" y="40"/>
-        <points x="390" y="241"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="sepHeader1"/>
-        <points y="40"/>
-        <points x="391" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="sepHeader"/>
-        <points y="60"/>
-        <points x="391" y="60"/>
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="300" height="100" x="1180" y="1740" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@loopStatement/@refinement/@secondStatement/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.7"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="100" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="index++;">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@loopStatement/@refinement/@secondStatement/@refinement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(index,result);&#xD;&#xA;index >= 0 &amp;&#xD;&#xA;(\exists int k;((k>=0 &amp; k&lt;index &#xD;&#xA;&amp; Client.clients[k].getName().equals(address) = TRUE) -> result = Client.clients[k]))}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@loopStatement/@refinement/@secondStatement/@refinement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="200" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{index >= 0 &amp;(\exists int k;(((k>=0 &amp; k&lt;index &amp; Client.clients[k].getName() != null&amp; Client.clients[k].getName().equals(address) = TRUE) -> result = Client.clients[k])))}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@loopStatement/@refinement/@secondStatement/@refinement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="280" y="10" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@loopStatement/@refinement/@secondStatement/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="100" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="200" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerSeparater"/>
-        <points y="40"/>
-        <points x="300" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preSep"/>
-        <points x="200"/>
-        <points x="200" y="100"/>
-========
-        <points x="350" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="116" height="20" x="116" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="invariants">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ivHeader"/>
->>>>>>>> master:Elevator/features/Base/Elevator/Elevator.diagram
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-<<<<<<<< HEAD:EmailCorC/src/Client/getClientByAdress.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postSep"/>
-        <points x="100"/>
-        <points x="100" y="100"/>
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" lineWidth="1" filled="true" transparency="0.0" width="381" height="211" x="1220" y="20" cornerHeight="20" cornerWidth="20">
-========
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor2Line"/>
-        <points y="60"/>
-        <points x="350" y="60"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor3Line"/>
-        <points y="100"/>
-        <points x="350" y="100"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="116" height="20" x="116" y="100" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="fields">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="fHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor4Line"/>
-        <points y="120"/>
-        <points x="350" y="120"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="350" height="30" y="123" horizontalAlignment="ALIGNMENT_CENTER" value="PRIVATE int weight">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="fieldsNameText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@fields.0"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="350" height="30" y="153" horizontalAlignment="ALIGNMENT_CENTER" value="PRIVATE int old_weight">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="fieldsNameText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@fields.1"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="350" height="30" y="183" horizontalAlignment="ALIGNMENT_CENTER" value="PRIVATE boolean old_contains">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="fieldsNameText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="2"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@fields.2"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="350" height="30" y="213" horizontalAlignment="ALIGNMENT_CENTER" value="PRIVATE boolean blocked">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="fieldsNameText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="3"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@fields.3"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="350" height="30" y="243" horizontalAlignment="ALIGNMENT_CENTER" value="PRIVATE ArrayList persons">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="fieldsNameText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="4"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@fields.4"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="350" height="30" y="273" horizontalAlignment="ALIGNMENT_CENTER" value="PRIVATE Environment env">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="fieldsNameText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="5"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@fields.5"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="350" height="30" y="303" horizontalAlignment="ALIGNMENT_CENTER" value="PRIVATE int doors">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="fieldsNameText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="6"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@fields.6"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="350" height="30" y="333" horizontalAlignment="ALIGNMENT_CENTER" value="PRIVATE int currentFloorID">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="fieldsNameText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="7"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@fields.7"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="350" height="30" y="363" horizontalAlignment="ALIGNMENT_CENTER" value="PRIVATE int currentHeading">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="fieldsNameText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="8"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@fields.8"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="350" height="30" y="393" horizontalAlignment="ALIGNMENT_CENTER" value="PRIVATE boolean verbose">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="fieldsNameText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="9"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@fields.9"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="350" height="30" y="423" horizontalAlignment="ALIGNMENT_CENTER" value="PRIVATE int old_currentFloorID">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="fieldsNameText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="10"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@fields.10"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="350" height="30" y="453" horizontalAlignment="ALIGNMENT_CENTER" value="PUBLIC boolean[] floorButtons">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="fieldsNameText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="11"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@fields.11"/>
-      </link>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="600" height="150" x="640" y="490" cornerHeight="20" cornerWidth="20">
->>>>>>>> master:Elevator/features/Base/Elevator/Elevator.diagram
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-<<<<<<<< HEAD:EmailCorC/src/Client/getClientByAdress.diagram
-      <businessObjects href="getClientByAdress.cbcmodel#/1"/>
-    </link>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="381" height="21" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Variables">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variablesName"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/1"/>
-========
-      <businessObjects href="Elevator.cbcclass#//@methods.0"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.11"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{p != null&amp; this.persons != null&amp; this.persons.elements != null}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="leaveElevator.cbcmodel#/0/@statement/@preCondition"/>
->>>>>>>> master:Elevator/features/Base/Elevator/Elevator.diagram
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="150" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="public boolean leaveElevator(Person p)">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="signatureText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@methods.0"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="300" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{(this.old_contains = TRUE -> (\result = TRUE &amp; p.isDestinationReached() = TRUE &amp; this.persons.contains(p) = FALSE))&#xD;&#xA;&amp; this.old_contains = FALSE -> \result = FALSE}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="leaveElevator.cbcmodel#/0/@statement/@postCondition"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="450" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="old_contains">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="modifiableText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@methods.0"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="150" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="signature">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="sigHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="300" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="450" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="modHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-<<<<<<<< HEAD:EmailCorC/src/Client/getClientByAdress.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-        <points y="21"/>
-        <points x="381" y="21"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="381" height="21" y="21" horizontalAlignment="ALIGNMENT_CENTER" value="PRIVATE String name">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Client.cbcclass#//@fields.0"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="381" height="21" y="42" horizontalAlignment="ALIGNMENT_CENTER" value="PRIVATE int id">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Client.cbcclass#//@fields.1"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="381" height="21" y="63" horizontalAlignment="ALIGNMENT_CENTER" value="PRIVATE static Client[] clients">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="2"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Client.cbcclass#//@fields.2"/>
-========
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerLine"/>
-        <points y="40"/>
-        <points x="600" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="leftLine"/>
-        <points x="150"/>
-        <points x="150" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="midLine"/>
-        <points x="300"/>
-        <points x="300" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="rightLine"/>
-        <points x="450"/>
-        <points x="450" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@methods.0"/>
->>>>>>>> master:Elevator/features/Base/Elevator/Elevator.diagram
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="381" height="21" y="84" horizontalAlignment="ALIGNMENT_CENTER" value="PRIVATE static int clientCounter">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="3"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Client.cbcclass#//@fields.3"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="381" height="21" y="105" horizontalAlignment="ALIGNMENT_CENTER" value="PRIVATE static int old_clientCounter">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="4"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Client.cbcclass#//@fields.4"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="381" height="21" y="126" horizontalAlignment="ALIGNMENT_CENTER" value="PARAM String address">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="5"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/1/@variables.0"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="381" height="21" y="147" horizontalAlignment="ALIGNMENT_CENTER" value="RETURN Client result">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="6"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/1/@variables.1"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="381" height="21" y="168" horizontalAlignment="ALIGNMENT_CENTER" value="LOCAL int index">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="7"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/1/@variables.2"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="381" height="21" y="189" horizontalAlignment="ALIGNMENT_CENTER" value="LOCAL Client result">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="8"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/1/@variables.3"/>
-      </link>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" lineWidth="1" filled="true" transparency="0.0" width="200" height="100" x="1350" y="260" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="getClientByAdress.cbcmodel#/2"/>
-    </link>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="50" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Global Conditions">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="globalConditionsName"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/2"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-        <points y="50"/>
-        <points x="200" y="50"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="200" height="50" y="50" horizontalAlignment="ALIGNMENT_CENTER" value="address !=null &amp; address.&lt;created> = TRUE">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="globalcondition"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/2/@conditions.0"/>
-      </link>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="300" height="100" x="1520" y="960" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.9"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="100" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="result;">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(index,result);&#xD;&#xA;(\exists int k;((k>=0 &amp; k&lt;Client.clients.length &#xD;&#xA;&amp; Client.clients[k].getName() != null&#xD;&#xA;&amp; Client.clients[k].getName().equals(address) = TRUE) -> result = Client.clients[k]))}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="200" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(index,result);&#xD;&#xA;(\exists int k;((k>=0 &amp; k&lt;Client.clients.length  &#xD;&#xA;&amp; Client.clients[k].getName() != null &#xD;&#xA;&amp; Client.clients[k].getName().equals(address) = TRUE) -> result = Client.clients[k]))}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="280" y="10" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="100" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="ReturnStatement">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="200" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerSeparater"/>
-        <points y="40"/>
-        <points x="300" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preSep"/>
-        <points x="200"/>
-        <points x="200" y="100"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postSep"/>
-        <points x="100"/>
-        <points x="100" y="100"/>
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="600" height="150" x="-220" y="810" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="Elevator.cbcclass#//@methods.1"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.5"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{floorID >= 0 &amp; this.floorButtons != null&amp; floorID &lt; this.floorButtons.length &amp; this.floorButtons != null}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="resetFloorButton.cbcmodel#/0/@statement/@preCondition"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="150" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="public void resetFloorButton(int floorID)">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="signatureText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@methods.1"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="300" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{this.floorButtons[floorID] = FALSE}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="resetFloorButton.cbcmodel#/0/@statement/@postCondition"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="450" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="floorButtons[floorID]">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="modifiableText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@methods.1"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="150" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="signature">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="sigHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="300" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="450" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="modHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerLine"/>
-        <points y="40"/>
-        <points x="600" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="leftLine"/>
-        <points x="150"/>
-        <points x="150" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="midLine"/>
-        <points x="300"/>
-        <points x="300" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="rightLine"/>
-        <points x="450"/>
-        <points x="450" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@methods.1"/>
-      </link>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="600" height="150" x="640" y="170" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="Elevator.cbcclass#//@methods.2"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.9"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{this.persons != null &amp;&#xD;&#xA;this.persons.elements != null &amp; &#xD;&#xA; this.floorButtons != null &amp; &#xD;&#xA;p != null &amp; &#xD;&#xA;p.getDestination()>= 0 &amp; p.getDestination() &lt; this.floorButtons.length}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="enterElevator.cbcmodel#/0/@statement/@preCondition"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="150" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="public void enterElevator(Person p)">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="signatureText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@methods.2"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="300" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{this.persons.contains(p) = TRUE&#xD;&#xA;&amp; this.floorButtons[p.getDestination()] = TRUE&#xD;&#xA;&amp; this.persons.size() = \old(this.persons.size()) + 1}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="enterElevator.cbcmodel#/0/@statement/@postCondition"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="450" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="modifiableText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@methods.2"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="150" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="signature">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="sigHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="300" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="450" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="modHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerLine"/>
-        <points y="40"/>
-        <points x="600" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="leftLine"/>
-        <points x="150"/>
-        <points x="150" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="midLine"/>
-        <points x="300"/>
-        <points x="300" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="rightLine"/>
-        <points x="450"/>
-        <points x="450" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@methods.2"/>
-      </link>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="600" height="150" x="560" y="650" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="Elevator.cbcclass#//@methods.3"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.7"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{this.persons != null}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="isEmpty.cbcmodel#/0/@statement/@preCondition"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="150" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="public boolean isEmpty()">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="signatureText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@methods.3"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="300" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{\result = this.persons.isEmpty()}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="isEmpty.cbcmodel#/0/@statement/@postCondition"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="450" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="modifiableText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@methods.3"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="150" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="signature">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="sigHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="300" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="450" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="modHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerLine"/>
-        <points y="40"/>
-        <points x="600" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="leftLine"/>
-        <points x="150"/>
-        <points x="150" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="midLine"/>
-        <points x="300"/>
-        <points x="300" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="rightLine"/>
-        <points x="450"/>
-        <points x="450" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@methods.3"/>
-      </link>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="600" height="150" x="640" y="330" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="Elevator.cbcclass#//@methods.4"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.8"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{this.blocked != null}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="isBlocked.cbcmodel#/0/@statement/@preCondition"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="150" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="public boolean isBlocked()">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="signatureText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@methods.4"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="300" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{((this.blocked = TRUE -> \result = TRUE)&#xD;&#xA;&amp; (this.blocked = FALSE -> \result = FALSE))}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="isBlocked.cbcmodel#/0/@statement/@postCondition"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="450" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="modifiableText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@methods.4"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="150" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="signature">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="sigHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="300" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="450" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="modHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerLine"/>
-        <points y="40"/>
-        <points x="600" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="leftLine"/>
-        <points x="150"/>
-        <points x="150" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="midLine"/>
-        <points x="300"/>
-        <points x="300" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="rightLine"/>
-        <points x="450"/>
-        <points x="450" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@methods.4"/>
-      </link>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="600" height="150" x="-430" y="10" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="Elevator.cbcclass#//@methods.5"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.0"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{this.floorButtons != null &amp; floorID >= 0 &amp; floorID &lt; this.floorButtons.length&amp; this.floorButtons[floorID] != null}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="pressInLiftFloorButton.cbcmodel#/0/@statement/@preCondition"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="150" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="public void pressInLiftFloorButton(int floorID)">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="signatureText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@methods.5"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="300" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{(this.floorButtons != null &amp; floorID >= 0 &amp; floorID &lt; this.floorButtons.length&amp; this.floorButtons[floorID] != null) -> this.floorButtons[floorID] = TRUE}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="pressInLiftFloorButton.cbcmodel#/0/@statement/@postCondition"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="450" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="floorButtons[floorID]">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="modifiableText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@methods.5"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="150" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="signature">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="sigHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="300" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="450" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="modHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerLine"/>
-        <points y="40"/>
-        <points x="600" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="leftLine"/>
-        <points x="150"/>
-        <points x="150" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="midLine"/>
-        <points x="300"/>
-        <points x="300" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="rightLine"/>
-        <points x="450"/>
-        <points x="450" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@methods.5"/>
-      </link>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="600" height="150" x="-430" y="170" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="Elevator.cbcclass#//@methods.6"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.1"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{this.env != null &amp; this.env != null}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getEnv.cbcmodel#/0/@statement/@preCondition"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="150" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="public Environment getEnv()">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="signatureText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@methods.6"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="300" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{\result = this.env}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getEnv.cbcmodel#/0/@statement/@postCondition"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="450" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="modifiableText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@methods.6"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="150" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="signature">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="sigHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="300" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="450" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="modHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerLine"/>
-        <points y="40"/>
-        <points x="600" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="leftLine"/>
-        <points x="150"/>
-        <points x="150" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="midLine"/>
-        <points x="300"/>
-        <points x="300" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="rightLine"/>
-        <points x="450"/>
-        <points x="450" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@methods.6"/>
-      </link>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="600" height="150" x="640" y="10" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="Elevator.cbcclass#//@methods.7"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.10"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{this.doors >= 0 &amp; this.doors &lt;= 1}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="areDoorsOpen.cbcmodel#/0/@statement/@preCondition"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="150" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="public boolean areDoorsOpen()">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="signatureText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@methods.7"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="300" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{(this.doors = 0 -> ret = TRUE)&#xD;&#xA;&amp; (this.doors = 1 -> ret = FALSE)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="areDoorsOpen.cbcmodel#/0/@statement/@postCondition"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="450" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="modifiableText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@methods.7"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="150" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="signature">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="sigHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="300" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="450" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="modHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerLine"/>
-        <points y="40"/>
-        <points x="600" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="leftLine"/>
-        <points x="150"/>
-        <points x="150" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="midLine"/>
-        <points x="300"/>
-        <points x="300" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="rightLine"/>
-        <points x="450"/>
-        <points x="450" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@methods.7"/>
-      </link>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="600" height="150" x="-430" y="330" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="Elevator.cbcclass#//@methods.8"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.2"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{floorID >= 0 &amp; this.floorButtons != null &amp; floorID &lt; this.floorButtons.length}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="buttonForFloorIsPressed.cbcmodel#/0/@statement/@preCondition"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="150" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="public boolean buttonForFloorIsPressed(int floorID)">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="signatureText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@methods.8"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="300" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{\result = this.floorButtons[floorID]}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="buttonForFloorIsPressed.cbcmodel#/0/@statement/@postCondition"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="450" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="modifiableText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@methods.8"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="150" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="signature">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="sigHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="300" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="450" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="modHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerLine"/>
-        <points y="40"/>
-        <points x="600" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="leftLine"/>
-        <points x="150"/>
-        <points x="150" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="midLine"/>
-        <points x="300"/>
-        <points x="300" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="rightLine"/>
-        <points x="450"/>
-        <points x="450" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@methods.8"/>
-      </link>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="600" height="150" x="-430" y="490" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="Elevator.cbcclass#//@methods.9"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.3"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{this.currentHeading >= 0 &amp; this.currentHeading &lt;= 1}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="reverse.cbcmodel#/0/@statement/@preCondition"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="150" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="public int reverse()">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="signatureText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@methods.9"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="300" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{(this.currentHeading = 0 -> \result = 1) &amp; (this.currentHeading = 1 -> \result = 0)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="reverse.cbcmodel#/0/@statement/@postCondition"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="450" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="modifiableText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@methods.9"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="150" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="signature">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="sigHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="300" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="450" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="modHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerLine"/>
-        <points y="40"/>
-        <points x="600" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="leftLine"/>
-        <points x="150"/>
-        <points x="150" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="midLine"/>
-        <points x="300"/>
-        <points x="300" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="rightLine"/>
-        <points x="450"/>
-        <points x="450" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@methods.9"/>
-      </link>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="600" height="150" x="-350" y="650" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="Elevator.cbcclass#//@methods.10"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.4"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{this.currentHeading >= 0 &amp; this.currentHeading &lt;= 1}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getCurrentDirection.cbcmodel#/0/@statement/@preCondition"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="150" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="public int getCurrentDirection()">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="signatureText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@methods.10"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="300" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{\result = this.currentHeading}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getCurrentDirection.cbcmodel#/0/@statement/@postCondition"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="450" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="modifiableText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@methods.10"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="150" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="signature">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="sigHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="300" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="450" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="modHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerLine"/>
-        <points y="40"/>
-        <points x="600" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="leftLine"/>
-        <points x="150"/>
-        <points x="150" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="midLine"/>
-        <points x="300"/>
-        <points x="300" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="rightLine"/>
-        <points x="450"/>
-        <points x="450" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@methods.10"/>
-      </link>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="600" height="150" x="420" y="810" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="Elevator.cbcclass#//@methods.11"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.6"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{this.currentFloorID>= 0}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getCurrentFloorID.cbcmodel#/0/@statement/@preCondition"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="150" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="public int getCurrentFloorID()">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="signatureText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@methods.11"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="300" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{\result = this.currentFloorID}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getCurrentFloorID.cbcmodel#/0/@statement/@postCondition"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="450" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="modifiableText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@methods.11"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="150" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="signature">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="sigHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="300" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="450" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="modHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerLine"/>
-        <points y="40"/>
-        <points x="600" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="leftLine"/>
-        <points x="150"/>
-        <points x="150" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="midLine"/>
-        <points x="300"/>
-        <points x="300" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="rightLine"/>
-        <points x="450"/>
-        <points x="450" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@methods.11"/>
-      </link>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.3" lineWidth="2" filled="true" transparency="0.0" width="600" height="150" x="480" y="-156" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="Elevator.cbcclass#//@methods.12"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.12"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{this.env != null &amp; this.env.floors != null &amp; this.floorButtons != null &amp; this.currentFloorID >= 0 &amp; this.currentFloorID &lt; this.env.floors.length&amp; this.currentFloorID &lt; this.floorButtons.length &amp; this.env.floors[this.currentFloorID] != null}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="stopRequestedAtCurrentFloor.cbcmodel#/0/@statement/@preCondition"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="150" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="public boolean stopRequestedAtCurrentFloor()">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="signatureText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@methods.12"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="300" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{((this.env.getFloor(this.currentFloorID).hasCall() = TRUE)-> \result = TRUE)&amp; ((this.floorButtons[this.currentFloorID] = TRUE) -> \result = TRUE)&#xD;&#xA;&amp; &#xD;&#xA;this.env != null &amp; this.env.floors != null &amp; this.floorButtons != null &amp; this.currentFloorID >= 0 &amp; this.currentFloorID &lt; this.env.floors.length&amp; this.currentFloorID &lt; this.floorButtons.length &amp; this.env.floors[this.currentFloorID] != null}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="stopRequestedAtCurrentFloor.cbcmodel#/0/@statement/@postCondition"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="450" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="modifiableText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@methods.12"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="150" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="signature">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="sigHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="300" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="450" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="modHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerLine"/>
-        <points y="40"/>
-        <points x="600" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="leftLine"/>
-        <points x="150"/>
-        <points x="150" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="midLine"/>
-        <points x="300"/>
-        <points x="300" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="rightLine"/>
-        <points x="450"/>
-        <points x="450" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" id="de.tu_bs.cs.isf.cbc.tool.unproven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@methods.12"/>
-      </link>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.3" lineWidth="2" filled="true" transparency="0.0" width="600" height="150" x="-140" y="-156" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="Elevator.cbcclass#//@methods.13"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.13"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{dir >= 0 &amp; dir &lt;= 1 &amp; this.currentHeading >= 0 &amp; this.currentFloorID >= 0&amp; this.env != null &amp; this.env.floors != null}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@preCondition"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="150" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="public void continueInDirection(int dir)">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="signatureText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@methods.13"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="300" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{((this.currentHeading = 1 &amp; this.env.isTopFloor(this.currentFloorID) = true) -> this.currentHeading = this.reverse()) &amp; ((this.currentHeading = 0 &amp; this.currentFloorID = 0) -> this.currentHeading = this.reverse())&amp; ((this.currentHeading = 1 ) -> this.currentFloorID = this.currentFloorID + 1)&amp; ((this.currentHeading != 1 ) -> this.currentFloorID = this.currentFloorID - 1)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="continueInDirection.cbcmodel#/0/@statement/@postCondition"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="450" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="modifiableText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@methods.13"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="150" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="signature">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="sigHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="300" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="450" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="modHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerLine"/>
-        <points y="40"/>
-        <points x="600" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="leftLine"/>
-        <points x="150"/>
-        <points x="150" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="midLine"/>
-        <points x="300"/>
-        <points x="300" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="rightLine"/>
-        <points x="450"/>
-        <points x="450" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" id="de.tu_bs.cs.isf.cbc.tool.unproven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Elevator.cbcclass#//@methods.13"/>
-      </link>
-    </children>
-  </children>
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@anchors.0" end="//@children.6/@anchors.0">
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@anchors.0" end="//@children.7/@anchors.0">
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-<<<<<<<< HEAD:EmailCorC/src/Client/getClientByAdress.diagram
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.1/@children.2/@anchors.0" end="//@children.3/@anchors.0">
-========
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@anchors.0" end="//@children.9/@anchors.0">
->>>>>>>> master:Elevator/features/Base/Elevator/Elevator.diagram
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-<<<<<<<< HEAD:EmailCorC/src/Client/getClientByAdress.diagram
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.4/@children.0/@anchors.0" end="//@children.5/@anchors.0">
-========
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@anchors.0" end="//@children.10/@anchors.0">
->>>>>>>> master:Elevator/features/Base/Elevator/Elevator.diagram
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-<<<<<<<< HEAD:EmailCorC/src/Client/getClientByAdress.diagram
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.5/@children.0/@anchors.0" end="//@children.6/@anchors.0">
-========
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@anchors.0" end="//@children.11/@anchors.0">
->>>>>>>> master:Elevator/features/Base/Elevator/Elevator.diagram
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-<<<<<<<< HEAD:EmailCorC/src/Client/getClientByAdress.diagram
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.6/@children.14/@anchors.0" end="//@children.7/@anchors.0">
-========
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@anchors.0" end="//@children.2/@anchors.0">
->>>>>>>> master:Elevator/features/Base/Elevator/Elevator.diagram
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-<<<<<<<< HEAD:EmailCorC/src/Client/getClientByAdress.diagram
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.6/@children.21/@anchors.0" end="//@children.8/@anchors.0">
-========
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@anchors.0" end="//@children.12/@anchors.0">
->>>>>>>> master:Elevator/features/Base/Elevator/Elevator.diagram
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-<<<<<<<< HEAD:EmailCorC/src/Client/getClientByAdress.diagram
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.5/@children.2/@anchors.0" end="//@children.9/@anchors.0">
-========
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@anchors.0" end="//@children.4/@anchors.0">
->>>>>>>> master:Elevator/features/Base/Elevator/Elevator.diagram
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-<<<<<<<< HEAD:EmailCorC/src/Client/getClientByAdress.diagram
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.3/@children.0/@anchors.0" end="//@children.4/@anchors.0">
-========
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@anchors.0" end="//@children.5/@anchors.0">
->>>>>>>> master:Elevator/features/Base/Elevator/Elevator.diagram
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-<<<<<<<< HEAD:EmailCorC/src/Client/getClientByAdress.diagram
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.3/@children.2/@anchors.0" end="//@children.12/@anchors.0">
-========
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@anchors.0" end="//@children.3/@anchors.0">
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@anchors.0" end="//@children.8/@anchors.0">
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@anchors.0" end="//@children.1/@anchors.0">
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@anchors.0" end="//@children.13/@anchors.0">
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@anchors.0" end="//@children.14/@anchors.0">
->>>>>>>> master:Elevator/features/Base/Elevator/Elevator.diagram
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-  <colors red="227" green="238" blue="249"/>
-  <colors red="255" green="255" blue="255"/>
-  <colors green="127"/>
-  <colors red="255"/>
-  <colors/>
-  <fonts name="Arial" size="9" bold="true"/>
-</pi:Diagram>
diff --git a/Elevator/features/Base/Environment/createEnvironment.diagram.orig b/Elevator/features/Base/Environment/createEnvironment.diagram.orig
deleted file mode 100644
index 51fce6a5a..000000000
--- a/Elevator/features/Base/Environment/createEnvironment.diagram.orig
+++ /dev/null
@@ -1,1960 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<<<<<<<< HEAD:ElevatorOO/features/Base/Floor/Floor.diagram
-<pi:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:al="http://eclipse.org/graphiti/mm/algorithms" xmlns:pi="http://eclipse.org/graphiti/mm/pictograms" visible="true" gridUnit="10" diagramTypeId="cbcclass" name="Floor" snapToGrid="true" pictogramLinks="//@children.0/@link //@children.0/@children.1/@link //@children.0/@children.0/@link //@children.0/@children.8/@link //@children.0/@children.9/@link //@children.0/@children.10/@link //@children.0/@children.11/@link //@children.1/@link //@children.1/@children.0/@link //@children.1/@children.2/@link //@children.1/@children.1/@link //@children.1/@children.3/@link //@children.1/@children.12/@link //@children.2/@link //@children.2/@children.0/@link //@children.2/@children.2/@link //@children.2/@children.1/@link //@children.2/@children.3/@link //@children.2/@children.12/@link //@children.3/@link //@children.3/@children.0/@link //@children.3/@children.2/@link //@children.3/@children.1/@link //@children.3/@children.3/@link //@children.3/@children.12/@link //@children.4/@link //@children.4/@children.0/@link //@children.4/@children.2/@link //@children.4/@children.1/@link //@children.4/@children.3/@link //@children.4/@children.12/@link //@children.5/@link //@children.5/@children.0/@link //@children.5/@children.2/@link //@children.5/@children.1/@link //@children.5/@children.3/@link //@children.5/@children.12/@link //@children.6/@link //@children.6/@children.0/@link //@children.6/@children.2/@link //@children.6/@children.1/@link //@children.6/@children.3/@link //@children.6/@children.12/@link //@children.7/@link //@children.7/@children.0/@link //@children.7/@children.2/@link //@children.7/@children.1/@link //@children.7/@children.3/@link //@children.7/@children.12/@link" version="0.18.0">
-========
-<pi:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:al="http://eclipse.org/graphiti/mm/algorithms" xmlns:pi="http://eclipse.org/graphiti/mm/pictograms" visible="true" gridUnit="10" diagramTypeId="cbc" name="createEnvironment" snapToGrid="true" pictogramLinks="//@children.0/@link //@link //@children.0/@children.0/@link //@children.0/@children.1/@link //@children.0/@children.2/@link //@children.0/@children.3/@link //@children.0/@children.4/@link //@children.0/@children.6/@link //@children.0/@children.7/@link //@children.1/@link //@children.1/@children.0/@link //@children.1/@children.2/@link //@children.1/@children.3/@link //@children.1/@children.4/@link //@children.2/@link //@children.2/@children.0/@link //@children.2/@children.2/@link //@children.2/@children.3/@link //@children.3/@link //@children.3/@children.1/@link //@children.3/@children.2/@link //@children.3/@children.0/@link //@children.3/@children.3/@link //@children.3/@children.5/@link //@children.3/@children.6/@link //@children.3/@children.7/@link //@children.3/@children.8/@link //@children.3/@children.9/@link //@children.4/@link //@children.4/@children.0/@link //@children.4/@children.1/@link //@children.4/@children.2/@link //@children.4/@children.3/@link //@children.4/@children.4/@link //@children.4/@children.5/@link //@children.5/@link //@children.5/@children.1/@link //@children.5/@children.0/@link //@children.5/@children.3/@link //@children.5/@children.2/@link //@children.5/@children.5/@link //@children.5/@children.6/@link //@children.5/@children.7/@link //@children.5/@children.8/@link //@children.5/@children.9/@link //@children.6/@link //@children.6/@children.0/@link //@children.6/@children.1/@link //@children.6/@children.2/@link //@children.6/@children.3/@link //@children.6/@children.4/@link //@children.6/@children.5/@link" version="0.18.0">
->>>>>>>> master:Elevator/features/Base/Environment/createEnvironment.diagram
-  <graphicsAlgorithm xsi:type="al:Rectangle" background="//@colors.1" foreground="//@colors.0" lineWidth="1" transparency="0.0" width="1000" height="1000"/>
-  <link>
-    <businessObjects href="createEnvironment.cbcmodel#/0"/>
-  </link>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-<<<<<<<< HEAD:ElevatorOO/features/Base/Floor/Floor.diagram
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" lineWidth="1" filled="true" transparency="0.0" width="350" height="291" x="140" y="30" cornerHeight="20" cornerWidth="20">
-========
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="400" height="200" x="20" y="20" cornerHeight="20" cornerWidth="20">
->>>>>>>> master:Elevator/features/Base/Environment/createEnvironment.diagram
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-<<<<<<<< HEAD:ElevatorOO/features/Base/Floor/Floor.diagram
-      <businessObjects href="Floor.cbcclass#/"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.0 //@connections.1 //@connections.2 //@connections.3 //@connections.4 //@connections.5 //@connections.6"/>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="330" y="10" id="de.tu_bs.cs.isf.cbc.tool.unproven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Floor.cbcclass#/"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="350" height="30" y="5" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Floor">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="nameText"/>
-========
-      <businessObjects href="createEnvironment.cbcmodel#/0"/>
-    </link>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="133" height="94" y="106" horizontalAlignment="ALIGNMENT_CENTER" value="{numFloors >= 0}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="createEnvironment.cbcmodel#/0/@statement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="133" height="46" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable();">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preConditionModifiables"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="createEnvironment.cbcmodel#/0/@statement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="133" height="140" x="133" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementNameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="createEnvironment.cbcmodel#/0/@statement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.3"/>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="133" height="94" x="266" y="106" horizontalAlignment="ALIGNMENT_CENTER" value="{this.floors.length = numFloors&amp; (\forall int k;((k>0 &amp; k&lt;this.floors.length -> (this.floors[k].thisFloorID = k &amp; this.floors[k].env = this))))}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="createEnvironment.cbcmodel#/0/@statement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="133" height="46" x="266" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable(index, this.floors, this.floors[index]);">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postConditionModifiables"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="createEnvironment.cbcmodel#/0/@statement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="400" height="30" y="5" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Formula">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="nameText"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="380" y="10" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="createEnvironment.cbcmodel#/0"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="1.0" width="19" height="20" x="10" y="10" id="de.tu_bs.cs.isf.cbc.tool.inheritance" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageinheritance"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="createEnvironment.cbcmodel#/0"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="133" height="20" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="133" height="20" x="266" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="133" height="20" x="133" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="stHeader"/>
->>>>>>>> master:Elevator/features/Base/Environment/createEnvironment.diagram
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Floor.cbcclass#/"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-        <points y="40"/>
-<<<<<<<< HEAD:ElevatorOO/features/Base/Floor/Floor.diagram
-        <points x="350" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="116" height="20" x="116" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="invariants">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ivHeader"/>
-========
-        <points x="400" y="40"/>
->>>>>>>> master:Elevator/features/Base/Environment/createEnvironment.diagram
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor2Line"/>
-        <points y="60"/>
-<<<<<<<< HEAD:ElevatorOO/features/Base/Floor/Floor.diagram
-        <points x="350" y="60"/>
-========
-        <points x="400" y="60"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor3Line"/>
-        <points y="106"/>
-        <points x="133" y="106"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor4Line"/>
-        <points x="266" y="106"/>
-        <points x="400" y="106"/>
->>>>>>>> master:Elevator/features/Base/Environment/createEnvironment.diagram
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-<<<<<<<< HEAD:ElevatorOO/features/Base/Floor/Floor.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor3Line"/>
-        <points y="100"/>
-        <points x="350" y="100"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="116" height="20" x="116" y="100" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="fields">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="fHeader"/>
-========
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver1Line"/>
-        <points x="133" y="40"/>
-        <points x="133" y="200"/>
->>>>>>>> master:Elevator/features/Base/Environment/createEnvironment.diagram
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-<<<<<<<< HEAD:ElevatorOO/features/Base/Floor/Floor.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor4Line"/>
-        <points y="120"/>
-        <points x="350" y="120"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="350" height="30" y="123" horizontalAlignment="ALIGNMENT_CENTER" value="PUBLIC ArrayList waiting">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="fieldsNameText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Floor.cbcclass#//@fields.0"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="350" height="30" y="153" horizontalAlignment="ALIGNMENT_CENTER" value="PRIVATE boolean elevatorCall">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="fieldsNameText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Floor.cbcclass#//@fields.1"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="350" height="30" y="183" horizontalAlignment="ALIGNMENT_CENTER" value="PRIVATE int thisFloorID">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="fieldsNameText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="2"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Floor.cbcclass#//@fields.2"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="350" height="30" y="213" horizontalAlignment="ALIGNMENT_CENTER" value="PUBLIC Environment env">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="fieldsNameText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="3"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Floor.cbcclass#//@fields.3"/>
-      </link>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.3" lineWidth="2" filled="true" transparency="0.0" width="600" height="150" x="530" y="30" cornerHeight="20" cornerWidth="20">
-========
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver2Line"/>
-        <points x="266" y="40"/>
-        <points x="266" y="200"/>
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" lineWidth="1" filled="true" transparency="0.0" width="200" height="100" x="600" y="20" cornerHeight="20" cornerWidth="20">
->>>>>>>> master:Elevator/features/Base/Environment/createEnvironment.diagram
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-<<<<<<<< HEAD:ElevatorOO/features/Base/Floor/Floor.diagram
-      <businessObjects href="Floor.cbcclass#//@methods.0"/>
-========
-      <businessObjects href="createEnvironment.cbcmodel#/1"/>
->>>>>>>> master:Elevator/features/Base/Environment/createEnvironment.diagram
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.2"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{person != null}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-<<<<<<<< HEAD:ElevatorOO/features/Base/Floor/Floor.diagram
-        <businessObjects href="addWaitingPerson.cbcmodel#/0/@statement/@preCondition"/>
-========
-        <businessObjects href="createEnvironment.cbcmodel#/1"/>
->>>>>>>> master:Elevator/features/Base/Environment/createEnvironment.diagram
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="150" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="public void addWaitingPerson(Person person)">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="signatureText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Floor.cbcclass#//@methods.0"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="300" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{this.hasCall() = TRUE &amp; this.waiting.contains(person) = TRUE}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="addWaitingPerson.cbcmodel#/0/@statement/@postCondition"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="450" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="modifiableText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Floor.cbcclass#//@methods.0"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="150" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="signature">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="sigHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="300" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="450" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="modHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerLine"/>
-        <points y="40"/>
-        <points x="600" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-<<<<<<<< HEAD:ElevatorOO/features/Base/Floor/Floor.diagram
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="leftLine"/>
-        <points x="150"/>
-        <points x="150" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="midLine"/>
-        <points x="300"/>
-        <points x="300" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="rightLine"/>
-        <points x="450"/>
-        <points x="450" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" id="de.tu_bs.cs.isf.cbc.tool.unproven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Floor.cbcclass#//@methods.0"/>
-========
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="25" y="75" horizontalAlignment="ALIGNMENT_CENTER" value="PUBLIC Floor[] floors">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="2"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Environment.cbcclass#//@fields.0"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="25" y="50" horizontalAlignment="ALIGNMENT_CENTER" value="PARAM int numFloors">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Environment.cbcclass#//@methods.2/@parameters.0"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="25" y="25" horizontalAlignment="ALIGNMENT_CENTER" value="LOCAL int index">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="createEnvironment.cbcmodel#/1/@variables.0"/>
->>>>>>>> master:Elevator/features/Base/Environment/createEnvironment.diagram
-      </link>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-<<<<<<<< HEAD:ElevatorOO/features/Base/Floor/Floor.diagram
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="600" height="150" x="530" y="190" cornerHeight="20" cornerWidth="20">
-========
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" lineWidth="1" filled="true" transparency="0.0" width="200" height="100" x="580" y="150" cornerHeight="20" cornerWidth="20">
->>>>>>>> master:Elevator/features/Base/Environment/createEnvironment.diagram
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-<<<<<<<< HEAD:ElevatorOO/features/Base/Floor/Floor.diagram
-      <businessObjects href="Floor.cbcclass#//@methods.1"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.3"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{true}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="callElevator.cbcmodel#/0/@statement/@preCondition"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="150" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="public void callElevator()">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="signatureText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Floor.cbcclass#//@methods.1"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="300" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(this.elevatorCall);&#xD;&#xA;this.elevatorCall = TRUE}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="callElevator.cbcmodel#/0/@statement/@postCondition"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="450" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="modifiableText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Floor.cbcclass#//@methods.1"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-========
-      <businessObjects href="createEnvironment.cbcmodel#/2"/>
-    </link>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="33" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Global Conditions">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="globalConditionsName"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="createEnvironment.cbcmodel#/2"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-        <points y="33"/>
-        <points x="200" y="33"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="200" height="33" y="33" horizontalAlignment="ALIGNMENT_CENTER" value="numFloors >= 0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="globalcondition"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="createEnvironment.cbcmodel#/2/@conditions.0"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="200" height="33" y="66" horizontalAlignment="ALIGNMENT_CENTER" value="index >= 0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="globalcondition"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="createEnvironment.cbcmodel#/2/@conditions.1"/>
-      </link>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="500" height="350" x="60" y="290" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="createEnvironment.cbcmodel#/0/@statement/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.3"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="135" y="215" horizontalAlignment="ALIGNMENT_CENTER" value="statement1">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement1NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="createEnvironment.cbcmodel#/0/@statement/@refinement/@firstStatement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.2"/>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="90" x="166" y="260" horizontalAlignment="ALIGNMENT_CENTER" value="{index = 0 &#xD;&#xA;&amp; this.floors.&lt;created> = TRUE &#xD;&#xA;&amp; this.floors.length = numFloors}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="conditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="createEnvironment.cbcmodel#/0/@statement/@refinement/@intermediateCondition"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="45" x="166" y="215" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable(index, this.floors);">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="otherConditionModifiables"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="createEnvironment.cbcmodel#/0/@statement/@refinement/@intermediateCondition"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="135" x="332" y="215" horizontalAlignment="ALIGNMENT_CENTER" value="statement2">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement2NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="createEnvironment.cbcmodel#/0/@statement/@refinement/@secondStatement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.1"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="500" height="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Composition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="nameText"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="90" y="105" horizontalAlignment="ALIGNMENT_CENTER" value="{numFloors >= 0}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="pre1NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="createEnvironment.cbcmodel#/0/@statement/@refinement/@firstStatement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="45" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable();">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preConditionModifiables"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="createEnvironment.cbcmodel#/0/@statement/@refinement/@firstStatement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="90" x="250" y="105" horizontalAlignment="ALIGNMENT_CENTER" value="{this.floors.length = numFloors&amp; (\forall int k;((k>0 &amp; k&lt;this.floors.length -> (this.floors[k].thisFloorID = k &amp; this.floors[k].env = this))))}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="post2NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="createEnvironment.cbcmodel#/0/@statement/@refinement/@secondStatement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="45" x="250" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable(index, this.floors, this.floors[index]);">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postConditionModifiables"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="createEnvironment.cbcmodel#/0/@statement/@refinement/@secondStatement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="480" y="10" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="createEnvironment.cbcmodel#/0/@statement/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
->>>>>>>> master:Elevator/features/Base/Environment/createEnvironment.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-<<<<<<<< HEAD:ElevatorOO/features/Base/Floor/Floor.diagram
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="150" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="signature">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="sigHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="300" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-========
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" x="250" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
->>>>>>>> master:Elevator/features/Base/Environment/createEnvironment.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-<<<<<<<< HEAD:ElevatorOO/features/Base/Floor/Floor.diagram
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="450" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="modHeader"/>
-========
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="166" height="20" y="195" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement 1">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement1Header"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="166" height="20" x="332" y="195" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement 2">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement2Header"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="166" height="20" x="166" y="195" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="intermediate condition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="intermediateCondHeader"/>
->>>>>>>> master:Elevator/features/Base/Environment/createEnvironment.diagram
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-<<<<<<<< HEAD:ElevatorOO/features/Base/Floor/Floor.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerLine"/>
-        <points y="40"/>
-        <points x="600" y="40"/>
-========
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-        <points y="40"/>
-        <points x="500" y="40"/>
->>>>>>>> master:Elevator/features/Base/Environment/createEnvironment.diagram
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-<<<<<<<< HEAD:ElevatorOO/features/Base/Floor/Floor.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="leftLine"/>
-        <points x="150"/>
-        <points x="150" y="150"/>
-========
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor2Line"/>
-        <points y="60"/>
-        <points x="500" y="60"/>
->>>>>>>> master:Elevator/features/Base/Environment/createEnvironment.diagram
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-<<<<<<<< HEAD:ElevatorOO/features/Base/Floor/Floor.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="midLine"/>
-        <points x="300"/>
-        <points x="300" y="150"/>
-========
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor3Line"/>
-        <points y="195"/>
-        <points x="500" y="195"/>
->>>>>>>> master:Elevator/features/Base/Environment/createEnvironment.diagram
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-<<<<<<<< HEAD:ElevatorOO/features/Base/Floor/Floor.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="rightLine"/>
-        <points x="450"/>
-        <points x="450" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Floor.cbcclass#//@methods.1"/>
-      </link>
-========
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor4Line"/>
-        <points y="215"/>
-        <points x="500" y="215"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor5Line"/>
-        <points x="166" y="260"/>
-        <points x="332" y="260"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor6Line"/>
-        <points y="105"/>
-        <points x="250" y="105"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor7Line"/>
-        <points x="250" y="105"/>
-        <points x="500" y="105"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver1Line"/>
-        <points x="250" y="40"/>
-        <points x="250" y="195"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver2Line"/>
-        <points x="166" y="195"/>
-        <points x="166" y="350"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver3Line"/>
-        <points x="332" y="195"/>
-        <points x="332" y="350"/>
-      </graphicsAlgorithm>
->>>>>>>> master:Elevator/features/Base/Environment/createEnvironment.diagram
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-<<<<<<<< HEAD:ElevatorOO/features/Base/Floor/Floor.diagram
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="600" height="150" x="-500" y="30" cornerHeight="20" cornerWidth="20">
-========
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="350" height="150" x="30" y="680" cornerHeight="20" cornerWidth="20">
->>>>>>>> master:Elevator/features/Base/Environment/createEnvironment.diagram
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-<<<<<<<< HEAD:ElevatorOO/features/Base/Floor/Floor.diagram
-      <businessObjects href="Floor.cbcclass#//@methods.2"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.5"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{envx != null&amp; idx >= 0}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="createFloor.cbcmodel#/0/@statement/@preCondition"/>
-========
-      <businessObjects href="createEnvironment.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.2"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="116" height="110" x="116" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="index = 0;&#xD;&#xA;this.floors = new Floor[numFloors];">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="createEnvironment.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement"/>
->>>>>>>> master:Elevator/features/Base/Environment/createEnvironment.diagram
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-<<<<<<<< HEAD:ElevatorOO/features/Base/Floor/Floor.diagram
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="150" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="public void createFloor(Environment envx, int idx)">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="signatureText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Floor.cbcclass#//@methods.2"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="300" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(this.env,this.thisFloorID,this.waiting);&#xD;&#xA;envx != null &amp; idx != null &amp; this.thisFloorID = idx &amp; this.env = envx &amp; this.waiting != null}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="createFloor.cbcmodel#/0/@statement/@postCondition"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="450" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="modifiableText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Floor.cbcclass#//@methods.2"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-========
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="116" height="72" y="76" horizontalAlignment="ALIGNMENT_CENTER" value="{numFloors >= 0}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="createEnvironment.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="116" height="36" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable();">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preConditionModifiables"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="createEnvironment.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="116" height="72" x="232" y="76" horizontalAlignment="ALIGNMENT_CENTER" value="{index = 0 &#xD;&#xA;&amp; this.floors.&lt;created> = TRUE &#xD;&#xA;&amp; this.floors.length = numFloors}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="createEnvironment.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="116" height="36" x="232" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable(index, this.floors);">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postConditionModifiables"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="createEnvironment.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="330" y="10" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="createEnvironment.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="116" height="20" x="116" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Statement">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="116" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
->>>>>>>> master:Elevator/features/Base/Environment/createEnvironment.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-<<<<<<<< HEAD:ElevatorOO/features/Base/Floor/Floor.diagram
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="150" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="signature">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="sigHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="300" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-========
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="116" height="20" x="232" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
->>>>>>>> master:Elevator/features/Base/Environment/createEnvironment.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-<<<<<<<< HEAD:ElevatorOO/features/Base/Floor/Floor.diagram
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="450" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="modHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerLine"/>
-        <points y="40"/>
-        <points x="600" y="40"/>
-========
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerSeparater"/>
-        <points y="40"/>
-        <points x="350" y="40"/>
->>>>>>>> master:Elevator/features/Base/Environment/createEnvironment.diagram
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-<<<<<<<< HEAD:ElevatorOO/features/Base/Floor/Floor.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="leftLine"/>
-        <points x="150"/>
-        <points x="150" y="150"/>
-========
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preSep"/>
-        <points x="232"/>
-        <points x="232" y="150"/>
->>>>>>>> master:Elevator/features/Base/Environment/createEnvironment.diagram
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-<<<<<<<< HEAD:ElevatorOO/features/Base/Floor/Floor.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="midLine"/>
-        <points x="300"/>
-        <points x="300" y="150"/>
-========
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postSep"/>
-        <points x="116"/>
-        <points x="116" y="150"/>
->>>>>>>> master:Elevator/features/Base/Environment/createEnvironment.diagram
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-<<<<<<<< HEAD:ElevatorOO/features/Base/Floor/Floor.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="rightLine"/>
-        <points x="450"/>
-        <points x="450" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Floor.cbcclass#//@methods.2"/>
-      </link>
-========
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-        <points y="76"/>
-        <points x="116" y="76"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor2Line"/>
-        <points x="232" y="76"/>
-        <points x="350" y="76"/>
-      </graphicsAlgorithm>
->>>>>>>> master:Elevator/features/Base/Environment/createEnvironment.diagram
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-<<<<<<<< HEAD:ElevatorOO/features/Base/Floor/Floor.diagram
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="600" height="150" x="-500" y="190" cornerHeight="20" cornerWidth="20">
-========
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="450" height="350" x="480" y="680" cornerHeight="20" cornerWidth="20">
->>>>>>>> master:Elevator/features/Base/Environment/createEnvironment.diagram
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-<<<<<<<< HEAD:ElevatorOO/features/Base/Floor/Floor.diagram
-      <businessObjects href="Floor.cbcclass#//@methods.3"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.6"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{this.thisFloorID>= 0}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getFloorID.cbcmodel#/0/@statement/@preCondition"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="150" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="public int getFloorID()">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="signatureText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Floor.cbcclass#//@methods.3"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="300" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{\result = this.thisFloorID}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getFloorID.cbcmodel#/0/@statement/@postCondition"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="450" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="modifiableText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Floor.cbcclass#//@methods.3"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="150" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="signature">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="sigHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="300" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="450" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="modHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerLine"/>
-        <points y="40"/>
-        <points x="600" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="leftLine"/>
-        <points x="150"/>
-        <points x="150" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="midLine"/>
-        <points x="300"/>
-        <points x="300" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="rightLine"/>
-        <points x="450"/>
-        <points x="450" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Floor.cbcclass#//@methods.3"/>
-      </link>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="600" height="150" x="15" y="350" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="Floor.cbcclass#//@methods.4"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.4"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{true}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="hasCall.cbcmodel#/0/@statement/@preCondition"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="150" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="public boolean hasCall()">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="signatureText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Floor.cbcclass#//@methods.4"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="300" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{(this.elevatorCall = TRUE -> \result = TRUE)&#xD;&#xA;&amp; (this.elevatorCall = FALSE -> \result = FALSE)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="hasCall.cbcmodel#/0/@statement/@postCondition"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="450" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="modifiableText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Floor.cbcclass#//@methods.4"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="150" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="signature">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="sigHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="300" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="450" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="modHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerLine"/>
-        <points y="40"/>
-        <points x="600" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="leftLine"/>
-        <points x="150"/>
-        <points x="150" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="midLine"/>
-        <points x="300"/>
-        <points x="300" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="rightLine"/>
-        <points x="450"/>
-        <points x="450" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Floor.cbcclass#//@methods.4"/>
-      </link>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.3" lineWidth="2" filled="true" transparency="0.0" width="600" height="150" x="330" y="-136" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="Floor.cbcclass#//@methods.5"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.1"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{true}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="processWaitingPersons.cbcmodel#/0/@statement/@preCondition"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="150" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="public void processWaitingPersons(Elevator e)">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="signatureText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Floor.cbcclass#//@methods.5"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="300" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{this.waiting.isEmpty() = TRUE &amp; this.hasCall() = FALSE}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="processWaitingPersons.cbcmodel#/0/@statement/@postCondition"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="450" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="modifiableText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Floor.cbcclass#//@methods.5"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="150" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="signature">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="sigHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="300" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-========
-      <businessObjects href="createEnvironment.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.1"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="186" x="150" y="164" horizontalAlignment="ALIGNMENT_CENTER" value="loop">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementRepNameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="createEnvironment.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@loopStatement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.0"/>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="83" x="150" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="index &lt; this.floors.length">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="conditionRepText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="createEnvironment.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@guard"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="83" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="index >= 0 &amp; this.floors.length = numFloors &amp;(\forall int k;(((k>0 &amp; k&lt;index &amp; k&lt;this.floors.length) -> (this.floors[k].thisFloorID = k &amp; this.floors[k].env = this ))))">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="invariantRepText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="createEnvironment.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@invariant"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="83" x="300" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="(this.floors.length - index)">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variantRepText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="createEnvironment.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@variant"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="450" height="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="RepetitionStatement DO...OD">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="nameText"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="124" y="226" horizontalAlignment="ALIGNMENT_CENTER" value="{(index >= 0 &amp; this.floors.length = numFloors &amp;(\forall int k;(((k>0 &amp; k&lt;index &amp; k&lt;this.floors.length) -> (this.floors[k].thisFloorID = k &amp; this.floors[k].env = this ))))) &amp; (index &lt; this.floors.length)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preNameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="createEnvironment.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@loopStatement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="62" y="164" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable(index, this.floors);">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preConditionModifiables"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="createEnvironment.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="124" x="300" y="226" horizontalAlignment="ALIGNMENT_CENTER" value="{index >= 0 &amp; this.floors.length = numFloors &amp;(\forall int k;(((k>0 &amp; k&lt;index &amp; k&lt;this.floors.length) -> (this.floors[k].thisFloorID = k &amp; this.floors[k].env = this ))))}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postNameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="createEnvironment.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@loopStatement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="62" x="300" y="164" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable(index, this.floors, this.floors[index]);">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postConditionModifiables"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="createEnvironment.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@loopStatement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="430" y="10" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="createEnvironment.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="300" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="variant">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variantHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="invariant">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="invariantHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="150" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="guard">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="guardHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="150" y="144" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="loop statement">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="loopHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="300" y="144" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
->>>>>>>> master:Elevator/features/Base/Environment/createEnvironment.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-<<<<<<<< HEAD:ElevatorOO/features/Base/Floor/Floor.diagram
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="450" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="modHeader"/>
-========
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" y="144" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
->>>>>>>> master:Elevator/features/Base/Environment/createEnvironment.diagram
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-<<<<<<<< HEAD:ElevatorOO/features/Base/Floor/Floor.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerLine"/>
-        <points y="40"/>
-        <points x="600" y="40"/>
-========
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver1SEP"/>
-        <points x="150" y="40"/>
-        <points x="150" y="350"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver2SEP"/>
-        <points x="300" y="40"/>
-        <points x="300" y="350"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1SEP"/>
-        <points y="60"/>
-        <points x="450" y="60"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor2SEP"/>
-        <points y="40"/>
-        <points x="450" y="40"/>
->>>>>>>> master:Elevator/features/Base/Environment/createEnvironment.diagram
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-<<<<<<<< HEAD:ElevatorOO/features/Base/Floor/Floor.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="leftLine"/>
-        <points x="150"/>
-        <points x="150" y="150"/>
-========
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor3SEP"/>
-        <points y="144"/>
-        <points x="450" y="144"/>
->>>>>>>> master:Elevator/features/Base/Environment/createEnvironment.diagram
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-<<<<<<<< HEAD:ElevatorOO/features/Base/Floor/Floor.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="midLine"/>
-        <points x="300"/>
-        <points x="300" y="150"/>
-========
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor4SEP"/>
-        <points y="164"/>
-        <points x="450" y="164"/>
->>>>>>>> master:Elevator/features/Base/Environment/createEnvironment.diagram
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-<<<<<<<< HEAD:ElevatorOO/features/Base/Floor/Floor.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="rightLine"/>
-        <points x="450"/>
-        <points x="450" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" id="de.tu_bs.cs.isf.cbc.tool.unproven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Floor.cbcclass#//@methods.5"/>
-      </link>
-========
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor5SEP"/>
-        <points y="226"/>
-        <points x="150" y="226"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor6SEP"/>
-        <points x="300" y="226"/>
-        <points x="450" y="226"/>
-      </graphicsAlgorithm>
->>>>>>>> master:Elevator/features/Base/Environment/createEnvironment.diagram
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-<<<<<<<< HEAD:ElevatorOO/features/Base/Floor/Floor.diagram
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="600" height="150" x="-300" y="-136" cornerHeight="20" cornerWidth="20">
-========
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="350" height="150" x="530" y="1090" cornerHeight="20" cornerWidth="20">
->>>>>>>> master:Elevator/features/Base/Environment/createEnvironment.diagram
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-<<<<<<<< HEAD:ElevatorOO/features/Base/Floor/Floor.diagram
-      <businessObjects href="Floor.cbcclass#//@methods.6"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.0"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{true}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="reset.cbcmodel#/0/@statement/@preCondition"/>
-========
-      <businessObjects href="createEnvironment.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@loopStatement/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.0"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="116" height="110" x="116" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="this.floors[index] = new Floor(this, index); index = index + 1;">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="createEnvironment.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@loopStatement/@refinement"/>
->>>>>>>> master:Elevator/features/Base/Environment/createEnvironment.diagram
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-<<<<<<<< HEAD:ElevatorOO/features/Base/Floor/Floor.diagram
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="150" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="public void reset()">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="signatureText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Floor.cbcclass#//@methods.6"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="300" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(this.elevatorCall);&#xD;&#xA;this.elevatorCall = FALSE}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="reset.cbcmodel#/0/@statement/@postCondition"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="450" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="modifiableText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Floor.cbcclass#//@methods.6"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-========
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="116" height="72" y="76" horizontalAlignment="ALIGNMENT_CENTER" value="{(index >= 0 &amp; this.floors.length = numFloors &amp;(\forall int k;(((k>0 &amp; k&lt;index &amp; k&lt;this.floors.length) -> (this.floors[k].thisFloorID = k &amp; this.floors[k].env = this ))))) &amp; (index &lt; this.floors.length)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="createEnvironment.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@loopStatement/@refinement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="116" height="36" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable(index, this.floors);">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preConditionModifiables"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="createEnvironment.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@loopStatement/@refinement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="116" height="72" x="232" y="76" horizontalAlignment="ALIGNMENT_CENTER" value="{index >= 0 &amp; this.floors.length = numFloors &amp;(\forall int k;(((k>0 &amp; k&lt;index &amp; k&lt;this.floors.length) -> (this.floors[k].thisFloorID = k &amp; this.floors[k].env = this ))))}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="createEnvironment.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@loopStatement/@refinement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="116" height="36" x="232" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable(index, this.floors, this.floors[index]);">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postConditionModifiables"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="createEnvironment.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@loopStatement/@refinement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="330" y="10" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="createEnvironment.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@loopStatement/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="116" height="20" x="116" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Statement">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="116" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
->>>>>>>> master:Elevator/features/Base/Environment/createEnvironment.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-<<<<<<<< HEAD:ElevatorOO/features/Base/Floor/Floor.diagram
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="150" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="signature">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="sigHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="300" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-========
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="116" height="20" x="232" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
->>>>>>>> master:Elevator/features/Base/Environment/createEnvironment.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-<<<<<<<< HEAD:ElevatorOO/features/Base/Floor/Floor.diagram
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="450" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="modHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerLine"/>
-        <points y="40"/>
-        <points x="600" y="40"/>
-========
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerSeparater"/>
-        <points y="40"/>
-        <points x="350" y="40"/>
->>>>>>>> master:Elevator/features/Base/Environment/createEnvironment.diagram
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-<<<<<<<< HEAD:ElevatorOO/features/Base/Floor/Floor.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="leftLine"/>
-        <points x="150"/>
-        <points x="150" y="150"/>
-========
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preSep"/>
-        <points x="232"/>
-        <points x="232" y="150"/>
->>>>>>>> master:Elevator/features/Base/Environment/createEnvironment.diagram
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-<<<<<<<< HEAD:ElevatorOO/features/Base/Floor/Floor.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="midLine"/>
-        <points x="300"/>
-        <points x="300" y="150"/>
-========
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postSep"/>
-        <points x="116"/>
-        <points x="116" y="150"/>
->>>>>>>> master:Elevator/features/Base/Environment/createEnvironment.diagram
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-<<<<<<<< HEAD:ElevatorOO/features/Base/Floor/Floor.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="rightLine"/>
-        <points x="450"/>
-        <points x="450" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Floor.cbcclass#//@methods.6"/>
-      </link>
-    </children>
-  </children>
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@anchors.0" end="//@children.7/@anchors.0">
-========
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-        <points y="76"/>
-        <points x="116" y="76"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor2Line"/>
-        <points x="232" y="76"/>
-        <points x="350" y="76"/>
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.5/@children.0/@anchors.0" end="//@children.6/@anchors.0">
->>>>>>>> master:Elevator/features/Base/Environment/createEnvironment.diagram
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-<<<<<<<< HEAD:ElevatorOO/features/Base/Floor/Floor.diagram
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@anchors.0" end="//@children.6/@anchors.0">
-========
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.3/@children.3/@anchors.0" end="//@children.5/@anchors.0">
->>>>>>>> master:Elevator/features/Base/Environment/createEnvironment.diagram
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-<<<<<<<< HEAD:ElevatorOO/features/Base/Floor/Floor.diagram
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@anchors.0" end="//@children.1/@anchors.0">
-========
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.3/@children.0/@anchors.0" end="//@children.4/@anchors.0">
->>>>>>>> master:Elevator/features/Base/Environment/createEnvironment.diagram
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-<<<<<<<< HEAD:ElevatorOO/features/Base/Floor/Floor.diagram
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@anchors.0" end="//@children.2/@anchors.0">
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@anchors.0" end="//@children.5/@anchors.0">
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@anchors.0" end="//@children.3/@anchors.0">
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@anchors.0" end="//@children.4/@anchors.0">
-========
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@children.2/@anchors.0" end="//@children.3/@anchors.0">
->>>>>>>> master:Elevator/features/Base/Environment/createEnvironment.diagram
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-  <colors red="227" green="238" blue="249"/>
-  <colors red="255" green="255" blue="255"/>
-  <colors green="127"/>
-  <colors red="255"/>
-  <colors/>
-  <fonts name="Arial" size="9" bold="true"/>
-</pi:Diagram>
diff --git a/ElevatorCorC/.DS_Store.orig b/ElevatorCorC/.DS_Store.orig
deleted file mode 100644
index 386539117..000000000
Binary files a/ElevatorCorC/.DS_Store.orig and /dev/null differ
diff --git a/EmailFeatureInteraction/.project.orig b/EmailFeatureInteraction/.project.orig
deleted file mode 100644
index 4c71e9eac..000000000
--- a/EmailFeatureInteraction/.project.orig
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-<<<<<<<< HEAD:EmailFeatureInteraction/.project
-	<name>EmailFeatureInteraction</name>
-========
-	<name>BankAccountOO</name>
->>>>>>>> master:BankAccountOO/.project
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/EmailOO/.classpath.orig b/EmailOO/.classpath.orig
deleted file mode 100644
index 2ed4e4d40..000000000
--- a/EmailOO/.classpath.orig
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-<<<<<<<< HEAD:BankAccountCorC/.classpath
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-========
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-16">
-		<attributes>
-			<attribute name="module" value="true"/>
-		</attributes>
-	</classpathentry>
->>>>>>>> master:EmailOO/.classpath
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/EmailOO/src/Client/Client.diagram.orig b/EmailOO/src/Client/Client.diagram.orig
deleted file mode 100644
index 0d9a2e87d..000000000
--- a/EmailOO/src/Client/Client.diagram.orig
+++ /dev/null
@@ -1,2756 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<<<<<<<< HEAD:BankAccountOO/features/BankAccount/Account/update.diagram
-<pi:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:al="http://eclipse.org/graphiti/mm/algorithms" xmlns:pi="http://eclipse.org/graphiti/mm/pictograms" visible="true" gridUnit="10" diagramTypeId="cbc" name="update" snapToGrid="true" pictogramLinks="//@children.0/@link //@link //@children.0/@children.0/@link //@children.0/@children.1/@link //@children.0/@children.2/@link //@children.0/@children.4/@link //@children.1/@link //@children.1/@children.0/@link //@children.1/@children.2/@link //@children.1/@children.3/@link //@children.1/@children.4/@link //@children.1/@children.5/@link //@children.1/@children.6/@link //@children.2/@link //@children.2/@children.0/@link //@children.2/@children.2/@link //@children.3/@link //@children.3/@children.1/@link //@children.3/@children.0/@link //@children.3/@children.2/@link //@children.3/@children.4/@link //@children.3/@children.5/@link //@children.3/@children.6/@link //@children.4/@link //@children.4/@children.1/@link //@children.4/@children.0/@link //@children.4/@children.2/@link //@children.4/@children.4/@link //@children.4/@children.5/@link //@children.4/@children.6/@link //@children.5/@link //@children.5/@children.0/@link //@children.5/@children.1/@link //@children.5/@children.2/@link //@children.5/@children.3/@link //@children.6/@link //@children.6/@children.0/@link //@children.6/@children.1/@link //@children.6/@children.2/@link //@children.6/@children.3/@link //@children.7/@link //@children.7/@children.1/@link //@children.7/@children.14/@link //@children.7/@children.15/@link //@children.7/@children.16/@link //@children.7/@children.20/@link //@children.7/@children.21/@link //@children.7/@children.22/@link //@children.7/@children.23/@link //@children.7/@children.27/@link //@children.8/@link //@children.8/@children.0/@link //@children.8/@children.1/@link //@children.8/@children.2/@link //@children.8/@children.3/@link //@children.9/@link //@children.9/@children.0/@link //@children.9/@children.1/@link //@children.9/@children.2/@link //@children.9/@children.3/@link" version="0.18.0">
-========
-<pi:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:al="http://eclipse.org/graphiti/mm/algorithms" xmlns:pi="http://eclipse.org/graphiti/mm/pictograms" visible="true" gridUnit="10" diagramTypeId="cbcclass" name="Client" snapToGrid="true" pictogramLinks="//@children.0/@link //@children.0/@children.1/@link //@children.0/@children.0/@link //@children.0/@children.8/@link //@children.0/@children.9/@link //@children.0/@children.10/@link //@children.0/@children.11/@link //@children.0/@children.12/@link //@children.1/@link //@children.1/@children.0/@link //@children.1/@children.2/@link //@children.1/@children.1/@link //@children.1/@children.3/@link //@children.1/@children.12/@link //@children.2/@link //@children.2/@children.0/@link //@children.2/@children.2/@link //@children.2/@children.1/@link //@children.2/@children.3/@link //@children.2/@children.12/@link //@children.3/@link //@children.3/@children.0/@link //@children.3/@children.2/@link //@children.3/@children.1/@link //@children.3/@children.3/@link //@children.3/@children.12/@link //@children.4/@link //@children.4/@children.0/@link //@children.4/@children.2/@link //@children.4/@children.1/@link //@children.4/@children.3/@link //@children.4/@children.12/@link //@children.5/@link //@children.5/@children.0/@link //@children.5/@children.2/@link //@children.5/@children.1/@link //@children.5/@children.3/@link //@children.5/@children.12/@link //@children.6/@link //@children.6/@children.0/@link //@children.6/@children.2/@link //@children.6/@children.1/@link //@children.6/@children.3/@link //@children.6/@children.12/@link //@children.7/@link //@children.7/@children.0/@link //@children.7/@children.2/@link //@children.7/@children.1/@link //@children.7/@children.3/@link //@children.7/@children.12/@link //@children.8/@link //@children.8/@children.0/@link //@children.8/@children.2/@link //@children.8/@children.1/@link //@children.8/@children.3/@link //@children.8/@children.12/@link //@children.9/@link //@children.9/@children.0/@link //@children.9/@children.2/@link //@children.9/@children.1/@link //@children.9/@children.3/@link //@children.9/@children.12/@link" version="0.18.0">
->>>>>>>> master:EmailOO/src/Client/Client.diagram
-  <graphicsAlgorithm xsi:type="al:Rectangle" background="//@colors.1" foreground="//@colors.0" lineWidth="1" transparency="0.0" width="1000" height="1000"/>
-  <link>
-    <businessObjects href="update.cbcmodel#/0"/>
-  </link>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-<<<<<<<< HEAD:BankAccountOO/features/BankAccount/Account/update.diagram
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="300" height="150" x="20" y="20" cornerHeight="20" cornerWidth="20">
-========
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" lineWidth="1" filled="true" transparency="0.0" width="350" height="321" x="140" y="60" cornerHeight="20" cornerWidth="20">
->>>>>>>> master:EmailOO/src/Client/Client.diagram
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-<<<<<<<< HEAD:BankAccountOO/features/BankAccount/Account/update.diagram
-      <businessObjects href="update.cbcmodel#/0"/>
-    </link>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="90" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="{true}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="90" x="100" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementNameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.6"/>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="90" x="200" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(balance,newBalance,ret);&#xD;&#xA;(\result = FALSE -> balance = \old(balance)) &amp; (\result = TRUE -> balance = \old(balance) + x)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="300" height="30" y="5" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Formula">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="nameText"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="280" y="10" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0"/>
-========
-      <businessObjects href="Client.cbcclass#/"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.0 //@connections.1 //@connections.2 //@connections.3 //@connections.4 //@connections.5 //@connections.6 //@connections.7 //@connections.8"/>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="330" y="10" id="de.tu_bs.cs.isf.cbc.tool.unproven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Client.cbcclass#/"/>
->>>>>>>> master:EmailOO/src/Client/Client.diagram
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="350" height="30" y="5" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Client">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="nameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Client.cbcclass#/"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-        <points y="40"/>
-        <points x="350" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="116" height="20" x="116" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="invariants">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ivHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor2Line"/>
-        <points y="60"/>
-<<<<<<<< HEAD:BankAccountOO/features/BankAccount/Account/update.diagram
-        <points x="300" y="60"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver1Line"/>
-        <points x="100" y="40"/>
-        <points x="100" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver2Line"/>
-        <points x="200" y="40"/>
-        <points x="200" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" lineWidth="1" filled="true" transparency="0.0" width="200" height="100" x="600" y="20" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="update.cbcmodel#/1"/>
-    </link>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="16" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Variables">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variablesName"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/1"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-        <points y="16"/>
-        <points x="200" y="16"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="16" y="80" horizontalAlignment="ALIGNMENT_CENTER" value="PUBLIC final int OVERDRAFT_LIMIT">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="4"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Account.cbcclass#//@fields.0"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="16" y="64" horizontalAlignment="ALIGNMENT_CENTER" value="PUBLIC int balance">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="3"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Account.cbcclass#//@fields.1"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="16" y="48" horizontalAlignment="ALIGNMENT_CENTER" value="PARAM int x">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="2"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Account.cbcclass#//@methods.0/@parameters.0"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="16" y="32" horizontalAlignment="ALIGNMENT_CENTER" value="RETURN boolean ret">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Account.cbcclass#//@methods.0/@parameters.1"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="16" y="16" horizontalAlignment="ALIGNMENT_CENTER" value="LOCAL int newBalance">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/1/@variables.0"/>
-      </link>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" lineWidth="1" filled="true" transparency="0.0" width="200" height="100" x="350" y="30" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="update.cbcmodel#/2"/>
-    </link>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="50" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Global Conditions">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="globalConditionsName"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/2"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-        <points y="50"/>
-        <points x="200" y="50"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="200" height="50" y="50" horizontalAlignment="ALIGNMENT_CENTER" value="OVERDRAFT_LIMIT = 0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="globalcondition"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/2/@conditions.0"/>
-      </link>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="500" height="300" x="110" y="190" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="update.cbcmodel#/0/@statement/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.6"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="100" y="200" horizontalAlignment="ALIGNMENT_CENTER" value="statement1">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement1NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@firstStatement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.4"/>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="100" x="166" y="200" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(newBalance);&#xD;&#xA;newBalance = balance + x}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="conditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@intermediateCondition"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="100" x="332" y="200" horizontalAlignment="ALIGNMENT_CENTER" value="statement2">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement2NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.5"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="500" height="60" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Composition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="nameText"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="100" y="80" horizontalAlignment="ALIGNMENT_CENTER" value="{true}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="pre1NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@firstStatement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="100" x="250" y="80" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(balance,newBalance,ret);&#xD;&#xA;(\result = FALSE -> balance = \old(balance)) &amp; (\result = TRUE -> balance = \old(balance) + x)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="post2NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="480" y="10" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" y="60" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" x="250" y="60" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="166" height="20" y="180" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement 1">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement1Header"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="166" height="20" x="332" y="180" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement 2">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement2Header"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="166" height="20" x="166" y="180" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="intermediate condition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="intermediateCondHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-        <points y="60"/>
-        <points x="500" y="60"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor2Line"/>
-        <points y="80"/>
-        <points x="500" y="80"/>
-========
-        <points x="350" y="60"/>
->>>>>>>> master:EmailOO/src/Client/Client.diagram
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor3Line"/>
-        <points y="100"/>
-        <points x="350" y="100"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="116" height="20" x="116" y="100" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="fields">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="fHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor4Line"/>
-<<<<<<<< HEAD:BankAccountOO/features/BankAccount/Account/update.diagram
-        <points y="200"/>
-        <points x="500" y="200"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver1Line"/>
-        <points x="250" y="60"/>
-        <points x="250" y="180"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver2Line"/>
-        <points x="166" y="180"/>
-        <points x="166" y="300"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver3Line"/>
-        <points x="332" y="180"/>
-        <points x="332" y="300"/>
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="500" height="300" x="320" y="520" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.5"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="100" y="200" horizontalAlignment="ALIGNMENT_CENTER" value="statement1">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement1NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.3"/>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="100" x="166" y="200" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(newBalance,ret,balance);&#xD;&#xA;(\result = FALSE -> balance = \old(balance)) &amp; (\result = TRUE -> balance = \old(balance) + x)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="conditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@intermediateCondition"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="100" x="332" y="200" horizontalAlignment="ALIGNMENT_CENTER" value="statement2">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement2NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.2"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="500" height="60" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Composition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="nameText"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="100" y="80" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(newBalance);&#xD;&#xA;newBalance = balance + x}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="pre1NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="100" x="250" y="80" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(balance,newBalance,ret);&#xD;&#xA;(\result = FALSE -> balance = \old(balance)) &amp; (\result = TRUE -> balance = \old(balance) + x)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="post2NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="480" y="10" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" y="60" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" x="250" y="60" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="166" height="20" y="180" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement 1">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement1Header"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="166" height="20" x="332" y="180" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement 2">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement2Header"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="166" height="20" x="166" y="180" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="intermediate condition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="intermediateCondHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-        <points y="60"/>
-        <points x="500" y="60"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor2Line"/>
-        <points y="80"/>
-        <points x="500" y="80"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor3Line"/>
-        <points y="180"/>
-        <points x="500" y="180"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor4Line"/>
-        <points y="200"/>
-        <points x="500" y="200"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver1Line"/>
-        <points x="250" y="60"/>
-        <points x="250" y="180"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver2Line"/>
-        <points x="166" y="180"/>
-        <points x="166" y="300"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver3Line"/>
-        <points x="332" y="180"/>
-        <points x="332" y="300"/>
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="300" height="100" x="-30" y="540" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.4"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="100" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="newBalance = balance + x;">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{true}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="200" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(newBalance);&#xD;&#xA;newBalance = balance + x}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="280" y="10" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="100" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="200" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerSeparater"/>
-        <points y="40"/>
-        <points x="300" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preSep"/>
-        <points x="200"/>
-        <points x="200" y="100"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postSep"/>
-        <points x="100"/>
-        <points x="100" y="100"/>
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="300" height="100" x="-140" y="1200" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.1"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="100" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="ret = false;">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(newBalance);(newBalance = balance + x) &amp; (newBalance &lt; this.OVERDRAFT_LIMIT)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="200" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(newBalance,ret,balance);&#xD;&#xA;(\result = FALSE -> balance = \old(balance)) &amp; (\result = TRUE -> balance = \old(balance) + x)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="280" y="10" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="100" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="200" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerSeparater"/>
-        <points y="40"/>
-        <points x="300" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preSep"/>
-        <points x="200"/>
-        <points x="200" y="100"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postSep"/>
-        <points x="100"/>
-        <points x="100" y="100"/>
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="200" height="300" x="230" y="850" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.3"/>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="200" height="40" horizontalAlignment="ALIGNMENT_CENTER" value="SelectionStatement IF..FI">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="nameText"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="180" y="10" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="20" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="guards">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="guardHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="20" y="105" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="20" y="170" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statements">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="20" y="235" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-        <points y="40"/>
-        <points x="200" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor2Line"/>
-        <points y="60"/>
-        <points x="200" y="60"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor3Line"/>
-        <points y="105"/>
-        <points x="200" y="105"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor4Line"/>
-        <points y="125"/>
-        <points x="200" y="125"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor5Line"/>
-        <points y="170"/>
-        <points x="200" y="170"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor6Line"/>
-        <points y="190"/>
-        <points x="200" y="190"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor7Line"/>
-        <points y="235"/>
-        <points x="200" y="235"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor8Line"/>
-        <points y="255"/>
-        <points x="200" y="255"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="45" y="190" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementSelNameText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.1"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="45" y="125" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(newBalance);(newBalance = balance + x) &amp; (newBalance &lt; this.OVERDRAFT_LIMIT)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="200" height="45" y="255" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(newBalance,ret,balance);&#xD;&#xA;(\result = FALSE -> balance = \old(balance)) &amp; (\result = TRUE -> balance = \old(balance) + x)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.0/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver1Line"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver2Line"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver3Line"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="45" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="newBalance &lt; this.OVERDRAFT_LIMIT">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="conditionSelText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@guards.0"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="45" x="100" y="190" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementSelNameText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.1"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.0"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="45" x="100" y="125" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(newBalance);(newBalance = balance + x) &amp; (newBalance >= this.OVERDRAFT_LIMIT)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.1/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(newBalance,ret,balance);&#xD;&#xA;(\result = FALSE -> balance = \old(balance)) &amp; (\result = TRUE -> balance = \old(balance) + x)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.1/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver1Line"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-        <points x="100" y="60"/>
-        <points x="100" y="105"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver2Line"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-        <points x="100" y="125"/>
-        <points x="100" y="170"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver3Line"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-        <points x="100" y="190"/>
-        <points x="100" y="235"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="45" x="100" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="newBalance >= this.OVERDRAFT_LIMIT">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="conditionSelText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@guards.1"/>
-      </link>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="300" height="100" x="690" y="880" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.2"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="100" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="ret;">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(newBalance,ret,balance);&#xD;&#xA;(\result = FALSE -> balance = \old(balance)) &amp; (\result = TRUE -> balance = \old(balance) + x)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="200" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(balance,newBalance,ret);&#xD;&#xA;(\result = FALSE -> balance = \old(balance)) &amp; (\result = TRUE -> balance = \old(balance) + x)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="280" y="10" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="100" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="ReturnStatement">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="200" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerSeparater"/>
-        <points y="40"/>
-        <points x="300" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preSep"/>
-        <points x="200"/>
-        <points x="200" y="100"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postSep"/>
-        <points x="100"/>
-        <points x="100" y="100"/>
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="300" height="100" x="430" y="1210" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.1/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.0"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="100" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="balance = newBalance;&#xD;&#xA;ret = true;">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.1/@refinement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(newBalance);(newBalance = balance + x) &amp; (newBalance >= this.OVERDRAFT_LIMIT)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.1/@refinement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="200" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(newBalance,ret,balance);&#xD;&#xA;(\result = FALSE -> balance = \old(balance)) &amp; (\result = TRUE -> balance = \old(balance) + x)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.1/@refinement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="280" y="10" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="update.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@commands.1/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="100" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="200" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerSeparater"/>
-        <points y="40"/>
-        <points x="300" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preSep"/>
-        <points x="200"/>
-        <points x="200" y="100"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postSep"/>
-        <points x="100"/>
-        <points x="100" y="100"/>
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.7/@children.21/@anchors.0" end="//@children.9/@anchors.0">
-========
-        <points y="120"/>
-        <points x="350" y="120"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="350" height="30" y="123" horizontalAlignment="ALIGNMENT_CENTER" value="PRIVATE String name">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="fieldsNameText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Client.cbcclass#//@fields.0"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="350" height="30" y="153" horizontalAlignment="ALIGNMENT_CENTER" value="PRIVATE int id">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="fieldsNameText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Client.cbcclass#//@fields.1"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="350" height="30" y="183" horizontalAlignment="ALIGNMENT_CENTER" value="PRIVATE Client[] clients">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="fieldsNameText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="2"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Client.cbcclass#//@fields.2"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="350" height="30" y="213" horizontalAlignment="ALIGNMENT_CENTER" value="PRIVATE int clientCounter">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="fieldsNameText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="3"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Client.cbcclass#//@fields.3"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="350" height="30" y="243" horizontalAlignment="ALIGNMENT_CENTER" value="PRIVATE int old_clientCounter">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="fieldsNameText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="4"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Client.cbcclass#//@fields.4"/>
-      </link>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="600" height="150" x="580" y="140" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="Client.cbcclass#//@methods.0"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.2"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{Client.clients != null &amp; id >= 0 &amp; id &lt; Client.clients.length}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientById.cbcmodel#/0/@statement/@preCondition"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="150" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="public static Client getClientById(int id)">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="signatureText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Client.cbcclass#//@methods.0"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="300" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{\result = Client.clients[id]}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientById.cbcmodel#/0/@statement/@postCondition"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="450" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="modifiableText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Client.cbcclass#//@methods.0"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="150" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="signature">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="sigHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="300" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="450" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="modHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerLine"/>
-        <points y="40"/>
-        <points x="600" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="leftLine"/>
-        <points x="150"/>
-        <points x="150" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="midLine"/>
-        <points x="300"/>
-        <points x="300" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="rightLine"/>
-        <points x="450"/>
-        <points x="450" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Client.cbcclass#//@methods.0"/>
-      </link>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="600" height="150" x="510" y="300" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="Client.cbcclass#//@methods.1"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.3"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{true}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getId.cbcmodel#/0/@statement/@preCondition"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="150" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="public int getId()">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="signatureText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Client.cbcclass#//@methods.1"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="300" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{\result  = this.id}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getId.cbcmodel#/0/@statement/@postCondition"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="450" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="modifiableText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Client.cbcclass#//@methods.1"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="150" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="signature">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="sigHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="300" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="450" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="modHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerLine"/>
-        <points y="40"/>
-        <points x="600" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="leftLine"/>
-        <points x="150"/>
-        <points x="150" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="midLine"/>
-        <points x="300"/>
-        <points x="300" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="rightLine"/>
-        <points x="450"/>
-        <points x="450" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Client.cbcclass#//@methods.1"/>
-      </link>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="600" height="150" x="-650" y="-30" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="Client.cbcclass#//@methods.2"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.8"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{true}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getName.cbcmodel#/0/@statement/@preCondition"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="150" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="public String getName()">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="signatureText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Client.cbcclass#//@methods.2"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="300" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{\result = this.name}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getName.cbcmodel#/0/@statement/@postCondition"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="450" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="modifiableText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Client.cbcclass#//@methods.2"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="150" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="signature">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="sigHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="300" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="450" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="modHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerLine"/>
-        <points y="40"/>
-        <points x="600" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="leftLine"/>
-        <points x="150"/>
-        <points x="150" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="midLine"/>
-        <points x="300"/>
-        <points x="300" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="rightLine"/>
-        <points x="450"/>
-        <points x="450" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Client.cbcclass#//@methods.2"/>
-      </link>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="600" height="150" x="670" y="-30" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="Client.cbcclass#//@methods.3"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.1"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{true}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getNameWithKeyword.cbcmodel#/0/@statement/@preCondition"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="150" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="public String getNameWithKeyword()">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="signatureText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Client.cbcclass#//@methods.3"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="300" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{\result = this.name}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getNameWithKeyword.cbcmodel#/0/@statement/@postCondition"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="450" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="modifiableText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Client.cbcclass#//@methods.3"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="150" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="signature">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="sigHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="300" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="450" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="modHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerLine"/>
-        <points y="40"/>
-        <points x="600" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="leftLine"/>
-        <points x="150"/>
-        <points x="150" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="midLine"/>
-        <points x="300"/>
-        <points x="300" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="rightLine"/>
-        <points x="450"/>
-        <points x="450" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Client.cbcclass#//@methods.3"/>
-      </link>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="600" height="150" x="-360" y="490" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="Client.cbcclass#//@methods.4"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.5"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{client != null &amp; msg != null}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="outgoing.cbcmodel#/0/@statement/@preCondition"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="150" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="public static void outgoing(Client client, Email msg)">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="signatureText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Client.cbcclass#//@methods.4"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="300" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{msg.from = client}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="outgoing.cbcmodel#/0/@statement/@postCondition"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="450" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="modifiableText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Client.cbcclass#//@methods.4"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="150" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="signature">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="sigHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="300" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="450" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="modHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerLine"/>
-        <points y="40"/>
-        <points x="600" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="leftLine"/>
-        <points x="150"/>
-        <points x="150" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="midLine"/>
-        <points x="300"/>
-        <points x="300" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="rightLine"/>
-        <points x="450"/>
-        <points x="450" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Client.cbcclass#//@methods.4"/>
-      </link>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="600" height="150" x="30" y="-120" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="Client.cbcclass#//@methods.5"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.0"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{Client.clients != null&amp; Client.clientCounter >= 0 &amp; Client.clients != null}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="resetClients.cbcmodel#/0/@statement/@preCondition"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="150" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="public static void resetClients()">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="signatureText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Client.cbcclass#//@methods.5"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="300" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{(\forall int k;(((k>=0 &amp; k&lt;Client.clients.length) -> Client.clients[k] = null))) &amp; Client.clientCounter = 1}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="resetClients.cbcmodel#/0/@statement/@postCondition"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="450" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="modifiableText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Client.cbcclass#//@methods.5"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="150" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="signature">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="sigHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="300" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="450" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="modHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerLine"/>
-        <points y="40"/>
-        <points x="600" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="leftLine"/>
-        <points x="150"/>
-        <points x="150" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="midLine"/>
-        <points x="300"/>
-        <points x="300" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="rightLine"/>
-        <points x="450"/>
-        <points x="450" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Client.cbcclass#//@methods.5"/>
-      </link>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="600" height="150" x="400" y="480" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="Client.cbcclass#//@methods.6"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.4"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{true &amp; idx >= 0 &amp; namex != null}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="constructClient.cbcmodel#/0/@statement/@preCondition"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="150" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="public void constructClient(int idx, String namex)">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="signatureText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Client.cbcclass#//@methods.6"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="300" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{(idx >= 0 &amp; namex != null) -> (this.id = idx &amp; this.name = namex)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="constructClient.cbcmodel#/0/@statement/@postCondition"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="450" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="id, name">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="modifiableText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Client.cbcclass#//@methods.6"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="150" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="signature">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="sigHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="300" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="450" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="modHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerLine"/>
-        <points y="40"/>
-        <points x="600" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="leftLine"/>
-        <points x="150"/>
-        <points x="150" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="midLine"/>
-        <points x="300"/>
-        <points x="300" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="rightLine"/>
-        <points x="450"/>
-        <points x="450" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Client.cbcclass#//@methods.6"/>
-      </link>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="600" height="150" x="-550" y="310" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="Client.cbcclass#//@methods.7"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.6"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{name != null &amp; name.&lt;created> = TRUE &amp; Client.clients != null&amp; Client.clientCounter &lt; Client.clients.length&amp; Client.clientCounter >= 0}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="createClient.cbcmodel#/0/@statement/@preCondition"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="150" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="public static Client createClient(String name)">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="signatureText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Client.cbcclass#//@methods.7"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="300" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{\result != null &amp; \result.&lt;created> = TRUE &amp; \result.getId() = \old(Client.clientCounter) &amp; \result.getName() = name &amp; Client.clientCounter = \old(Client.clientCounter) + 1 &amp; Client.clients[\result.getId()] = \result}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="createClient.cbcmodel#/0/@statement/@postCondition"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="450" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="modifiableText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Client.cbcclass#//@methods.7"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="150" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="signature">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="sigHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="300" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="450" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="modHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerLine"/>
-        <points y="40"/>
-        <points x="600" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="leftLine"/>
-        <points x="150"/>
-        <points x="150" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="midLine"/>
-        <points x="300"/>
-        <points x="300" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="rightLine"/>
-        <points x="450"/>
-        <points x="450" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Client.cbcclass#//@methods.7"/>
-      </link>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="600" height="150" x="-640" y="140" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="Client.cbcclass#//@methods.8"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.7"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{Client.clients != null}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@preCondition"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="150" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="public static Client getClientByAdress(String address)">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="signatureText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Client.cbcclass#//@methods.8"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="300" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{(\exists int k;((k>=0 &amp; k&lt;Client.clients.length  &#xD;&#xA;&amp; Client.clients[k].getName() != null &#xD;&#xA;&amp; Client.clients[k].getName().equals(address) = TRUE) -> result = Client.clients[k]))}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getClientByAdress.cbcmodel#/0/@statement/@postCondition"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="110" x="450" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="modifiableText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Client.cbcclass#//@methods.8"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="150" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="signature">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="sigHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="300" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="450" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="modHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerLine"/>
-        <points y="40"/>
-        <points x="600" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="leftLine"/>
-        <points x="150"/>
-        <points x="150" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="midLine"/>
-        <points x="300"/>
-        <points x="300" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="rightLine"/>
-        <points x="450"/>
-        <points x="450" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Client.cbcclass#//@methods.8"/>
-      </link>
-    </children>
-  </children>
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@anchors.0" end="//@children.6/@anchors.0">
->>>>>>>> master:EmailOO/src/Client/Client.diagram
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-<<<<<<<< HEAD:BankAccountOO/features/BankAccount/Account/update.diagram
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.7/@children.14/@anchors.0" end="//@children.6/@anchors.0">
-========
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@anchors.0" end="//@children.4/@anchors.0">
->>>>>>>> master:EmailOO/src/Client/Client.diagram
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-<<<<<<<< HEAD:BankAccountOO/features/BankAccount/Account/update.diagram
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.4/@children.2/@anchors.0" end="//@children.8/@anchors.0">
-========
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@anchors.0" end="//@children.1/@anchors.0">
->>>>>>>> master:EmailOO/src/Client/Client.diagram
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-<<<<<<<< HEAD:BankAccountOO/features/BankAccount/Account/update.diagram
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.4/@children.0/@anchors.0" end="//@children.7/@anchors.0">
-========
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@anchors.0" end="//@children.2/@anchors.0">
->>>>>>>> master:EmailOO/src/Client/Client.diagram
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-<<<<<<<< HEAD:BankAccountOO/features/BankAccount/Account/update.diagram
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.3/@children.0/@anchors.0" end="//@children.5/@anchors.0">
-========
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@anchors.0" end="//@children.7/@anchors.0">
->>>>>>>> master:EmailOO/src/Client/Client.diagram
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-<<<<<<<< HEAD:BankAccountOO/features/BankAccount/Account/update.diagram
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.3/@children.2/@anchors.0" end="//@children.4/@anchors.0">
-========
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@anchors.0" end="//@children.5/@anchors.0">
->>>>>>>> master:EmailOO/src/Client/Client.diagram
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-<<<<<<<< HEAD:BankAccountOO/features/BankAccount/Account/update.diagram
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@children.1/@anchors.0" end="//@children.3/@anchors.0">
-========
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@anchors.0" end="//@children.8/@anchors.0">
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@anchors.0" end="//@children.9/@anchors.0">
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@anchors.0" end="//@children.3/@anchors.0">
->>>>>>>> master:EmailOO/src/Client/Client.diagram
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-  <colors red="227" green="238" blue="249"/>
-  <colors red="255" green="255" blue="255"/>
-  <colors green="127"/>
-  <colors red="255"/>
-  <colors/>
-  <fonts name="Arial" size="9" bold="true"/>
-</pi:Diagram>
diff --git a/EmailOO/src/Client/resetClients.diagram.orig b/EmailOO/src/Client/resetClients.diagram.orig
deleted file mode 100644
index 52a3a9119..000000000
--- a/EmailOO/src/Client/resetClients.diagram.orig
+++ /dev/null
@@ -1,1737 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<<<<<<<< HEAD:EmailCorC/src/Client/getName.diagram
-<pi:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:al="http://eclipse.org/graphiti/mm/algorithms" xmlns:pi="http://eclipse.org/graphiti/mm/pictograms" visible="true" gridUnit="10" diagramTypeId="cbc" name="getName" snapToGrid="true" pictogramLinks="//@children.0/@link //@link //@children.0/@children.0/@link //@children.0/@children.1/@link //@children.0/@children.2/@link //@children.0/@children.4/@link //@children.1/@link //@children.1/@children.1/@link //@children.1/@children.0/@link //@children.1/@children.2/@link //@children.1/@children.4/@link //@children.1/@children.5/@link //@children.1/@children.6/@link //@children.2/@link //@children.2/@children.0/@link //@children.2/@children.1/@link //@children.2/@children.2/@link //@children.2/@children.3/@link //@children.3/@link //@children.3/@children.1/@link //@children.3/@children.0/@link //@children.3/@children.2/@link //@children.3/@children.4/@link //@children.3/@children.5/@link //@children.3/@children.6/@link //@children.4/@link //@children.4/@children.0/@link //@children.4/@children.1/@link //@children.4/@children.2/@link //@children.4/@children.3/@link //@children.5/@link //@children.5/@children.0/@link //@children.5/@children.1/@link //@children.5/@children.2/@link //@children.5/@children.3/@link //@children.6/@link //@children.6/@children.0/@link //@children.6/@children.2/@link //@children.6/@children.3/@link //@children.6/@children.4/@link //@children.6/@children.5/@link //@children.6/@children.6/@link //@children.6/@children.7/@link //@children.6/@children.8/@link //@children.7/@link //@children.7/@children.0/@link" version="0.18.0">
-  <graphicsAlgorithm xsi:type="al:Rectangle" background="//@colors.1" foreground="//@colors.0" lineWidth="1" transparency="0.0" width="1000" height="1000"/>
-  <link>
-    <businessObjects href="getName.cbcmodel#/0"/>
-  </link>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.3" lineWidth="2" filled="true" transparency="0.0" width="300" height="150" x="20" y="20" cornerHeight="20" cornerWidth="20">
-========
-<pi:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:al="http://eclipse.org/graphiti/mm/algorithms" xmlns:pi="http://eclipse.org/graphiti/mm/pictograms" visible="true" gridUnit="10" diagramTypeId="cbc" name="resetClients" snapToGrid="true" pictogramLinks="//@children.0/@link //@link //@children.0/@children.0/@link //@children.0/@children.1/@link //@children.0/@children.2/@link //@children.0/@children.3/@link //@children.0/@children.4/@link //@children.0/@children.6/@link //@children.0/@children.7/@link //@children.1/@link //@children.1/@children.0/@link //@children.1/@children.2/@link //@children.1/@children.3/@link //@children.1/@children.4/@link //@children.1/@children.5/@link //@children.1/@children.6/@link //@children.1/@children.7/@link //@children.2/@link //@children.2/@children.1/@link //@children.2/@children.2/@link //@children.2/@children.0/@link //@children.2/@children.3/@link //@children.2/@children.5/@link //@children.2/@children.6/@link //@children.2/@children.7/@link //@children.2/@children.8/@link //@children.2/@children.9/@link //@children.3/@link //@children.3/@children.0/@link //@children.3/@children.1/@link //@children.3/@children.2/@link //@children.3/@children.3/@link //@children.3/@children.4/@link //@children.3/@children.5/@link //@children.4/@link //@children.4/@children.1/@link //@children.4/@children.0/@link //@children.4/@children.3/@link //@children.4/@children.2/@link //@children.4/@children.5/@link //@children.4/@children.6/@link //@children.4/@children.7/@link //@children.4/@children.8/@link //@children.4/@children.9/@link //@children.5/@link //@children.5/@children.0/@link //@children.5/@children.1/@link //@children.5/@children.2/@link //@children.5/@children.3/@link //@children.5/@children.4/@link //@children.5/@children.5/@link" version="0.18.0">
-  <graphicsAlgorithm xsi:type="al:Rectangle" background="//@colors.1" foreground="//@colors.0" lineWidth="1" transparency="0.0" width="1000" height="1000"/>
-  <link>
-    <businessObjects href="resetClients.cbcmodel#/0"/>
-  </link>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="400" height="200" x="20" y="20" cornerHeight="20" cornerWidth="20">
->>>>>>>> master:EmailOO/src/Client/resetClients.diagram
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-<<<<<<<< HEAD:EmailCorC/src/Client/getName.diagram
-      <businessObjects href="getName.cbcmodel#/0"/>
-    </link>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="90" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="{ true}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getName.cbcmodel#/0/@statement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="90" x="100" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementNameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getName.cbcmodel#/0/@statement"/>
-========
-      <businessObjects href="resetClients.cbcmodel#/0"/>
-    </link>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="133" height="94" y="106" horizontalAlignment="ALIGNMENT_CENTER" value="{Client.clients != null&amp; Client.clientCounter >= 0 &amp; Client.clients != null}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="resetClients.cbcmodel#/0/@statement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="133" height="46" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable();">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preConditionModifiables"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="resetClients.cbcmodel#/0/@statement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="133" height="140" x="133" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementNameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="resetClients.cbcmodel#/0/@statement"/>
->>>>>>>> master:EmailOO/src/Client/resetClients.diagram
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.3"/>
-    </children>
-    <children visible="true" active="true">
-<<<<<<<< HEAD:EmailCorC/src/Client/getName.diagram
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="90" x="200" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="{ (this.name != null -> result = this.name) &amp; (this.name = null -> result = null)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getName.cbcmodel#/0/@statement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="300" height="30" y="5" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Formula">
-========
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="133" height="94" x="266" y="106" horizontalAlignment="ALIGNMENT_CENTER" value="{(\forall int k;(((k>=0 &amp; k&lt;Client.clients.length) -> Client.clients[k] = null))) &amp; Client.clientCounter = 1}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="resetClients.cbcmodel#/0/@statement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="133" height="46" x="266" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable(Client.clientCounter, Client.clients[index], index);">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postConditionModifiables"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="resetClients.cbcmodel#/0/@statement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="400" height="30" y="5" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Formula">
->>>>>>>> master:EmailOO/src/Client/resetClients.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="nameText"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-<<<<<<<< HEAD:EmailCorC/src/Client/getName.diagram
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="280" y="10" id="de.tu_bs.cs.isf.cbc.tool.unproven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getName.cbcmodel#/0"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-========
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="380" y="10" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="resetClients.cbcmodel#/0"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="1.0" width="19" height="20" x="10" y="10" id="de.tu_bs.cs.isf.cbc.tool.inheritance" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageinheritance"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="resetClients.cbcmodel#/0"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="133" height="20" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
->>>>>>>> master:EmailOO/src/Client/resetClients.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-<<<<<<<< HEAD:EmailCorC/src/Client/getName.diagram
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="200" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-========
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="133" height="20" x="266" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
->>>>>>>> master:EmailOO/src/Client/resetClients.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-<<<<<<<< HEAD:EmailCorC/src/Client/getName.diagram
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="100" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
-========
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="133" height="20" x="133" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
->>>>>>>> master:EmailOO/src/Client/resetClients.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="stHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-        <points y="40"/>
-<<<<<<<< HEAD:EmailCorC/src/Client/getName.diagram
-        <points x="300" y="40"/>
-========
-        <points x="400" y="40"/>
->>>>>>>> master:EmailOO/src/Client/resetClients.diagram
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor2Line"/>
-        <points y="60"/>
-<<<<<<<< HEAD:EmailCorC/src/Client/getName.diagram
-        <points x="300" y="60"/>
-========
-        <points x="400" y="60"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor3Line"/>
-        <points y="106"/>
-        <points x="133" y="106"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor4Line"/>
-        <points x="266" y="106"/>
-        <points x="400" y="106"/>
->>>>>>>> master:EmailOO/src/Client/resetClients.diagram
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver1Line"/>
-<<<<<<<< HEAD:EmailCorC/src/Client/getName.diagram
-        <points x="100" y="40"/>
-        <points x="100" y="150"/>
-========
-        <points x="133" y="40"/>
-        <points x="133" y="200"/>
->>>>>>>> master:EmailOO/src/Client/resetClients.diagram
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver2Line"/>
-<<<<<<<< HEAD:EmailCorC/src/Client/getName.diagram
-        <points x="200" y="40"/>
-        <points x="200" y="150"/>
-========
-        <points x="266" y="40"/>
-        <points x="266" y="200"/>
->>>>>>>> master:EmailOO/src/Client/resetClients.diagram
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-<<<<<<<< HEAD:EmailCorC/src/Client/getName.diagram
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.3" lineWidth="2" filled="true" transparency="0.0" width="500" height="300" x="20" y="220" cornerHeight="20" cornerWidth="20">
-========
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" lineWidth="1" filled="true" transparency="0.0" width="200" height="100" x="600" y="20" cornerHeight="20" cornerWidth="20">
->>>>>>>> master:EmailOO/src/Client/resetClients.diagram
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-<<<<<<<< HEAD:EmailCorC/src/Client/getName.diagram
-      <businessObjects href="getName.cbcmodel#/0/@statement/@refinement"/>
-========
-      <businessObjects href="resetClients.cbcmodel#/1"/>
->>>>>>>> master:EmailOO/src/Client/resetClients.diagram
-    </link>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="14" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Variables">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variablesName"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="resetClients.cbcmodel#/1"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-        <points y="14"/>
-        <points x="200" y="14"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="14" y="84" horizontalAlignment="ALIGNMENT_CENTER" value="PRIVATE String name">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="5"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="../../bin/Client/Client.cbcclass#//@fields.0"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="14" y="70" horizontalAlignment="ALIGNMENT_CENTER" value="PRIVATE int id">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="4"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="../../bin/Client/Client.cbcclass#//@fields.1"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="14" y="56" horizontalAlignment="ALIGNMENT_CENTER" value="PRIVATE Client[] clients">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="3"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="../../bin/Client/Client.cbcclass#//@fields.2"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="14" y="42" horizontalAlignment="ALIGNMENT_CENTER" value="PRIVATE int clientCounter">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="2"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="../../bin/Client/Client.cbcclass#//@fields.3"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="14" y="28" horizontalAlignment="ALIGNMENT_CENTER" value="PRIVATE int old_clientCounter">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="../../bin/Client/Client.cbcclass#//@fields.4"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="14" y="14" horizontalAlignment="ALIGNMENT_CENTER" value="LOCAL int index">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="resetClients.cbcmodel#/1/@variables.0"/>
-      </link>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="500" height="350" x="370" y="280" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="resetClients.cbcmodel#/0/@statement/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.3"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="135" y="215" horizontalAlignment="ALIGNMENT_CENTER" value="statement1">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement1NameText"/>
-      </graphicsAlgorithm>
-      <link>
-<<<<<<<< HEAD:EmailCorC/src/Client/getName.diagram
-        <businessObjects href="getName.cbcmodel#/0/@statement/@refinement/@firstStatement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.1"/>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="100" x="166" y="200" horizontalAlignment="ALIGNMENT_CENTER" value="{intermediateCond}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="conditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getName.cbcmodel#/0/@statement/@refinement/@intermediateCondition"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="100" x="332" y="200" horizontalAlignment="ALIGNMENT_CENTER" value="statement2">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement2NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getName.cbcmodel#/0/@statement/@refinement/@secondStatement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.2"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="500" height="60" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Composition">
-========
-        <businessObjects href="resetClients.cbcmodel#/0/@statement/@refinement/@firstStatement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.2"/>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="90" x="166" y="260" horizontalAlignment="ALIGNMENT_CENTER" value="{index = 0 &amp; Client.clientCounter = 1}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="conditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="resetClients.cbcmodel#/0/@statement/@refinement/@intermediateCondition"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="45" x="166" y="215" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable(Client.clientCounter, index);">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="otherConditionModifiables"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="resetClients.cbcmodel#/0/@statement/@refinement/@intermediateCondition"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="135" x="332" y="215" horizontalAlignment="ALIGNMENT_CENTER" value="statement2">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement2NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="resetClients.cbcmodel#/0/@statement/@refinement/@secondStatement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.1"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="500" height="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Composition">
->>>>>>>> master:EmailOO/src/Client/resetClients.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="nameText"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-<<<<<<<< HEAD:EmailCorC/src/Client/getName.diagram
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="100" y="80" horizontalAlignment="ALIGNMENT_CENTER" value="{ true}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="pre1NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getName.cbcmodel#/0/@statement/@refinement/@firstStatement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="100" x="250" y="80" horizontalAlignment="ALIGNMENT_CENTER" value="{ (this.name != null -> result = this.name) &amp; (this.name = null -> result = null)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="post2NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getName.cbcmodel#/0/@statement/@refinement/@secondStatement/@postCondition"/>
-========
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="90" y="105" horizontalAlignment="ALIGNMENT_CENTER" value="{Client.clients != null&amp; Client.clientCounter >= 0 &amp; Client.clients != null}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="pre1NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="resetClients.cbcmodel#/0/@statement/@refinement/@firstStatement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="45" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable();">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preConditionModifiables"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="resetClients.cbcmodel#/0/@statement/@refinement/@firstStatement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="90" x="250" y="105" horizontalAlignment="ALIGNMENT_CENTER" value="{(\forall int k;(((k>=0 &amp; k&lt;Client.clients.length) -> Client.clients[k] = null))) &amp; Client.clientCounter = 1}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="post2NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="resetClients.cbcmodel#/0/@statement/@refinement/@secondStatement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="45" x="250" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable(Client.clientCounter, Client.clients[index], index);">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postConditionModifiables"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="resetClients.cbcmodel#/0/@statement/@refinement/@secondStatement/@postCondition"/>
->>>>>>>> master:EmailOO/src/Client/resetClients.diagram
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="480" y="10" id="de.tu_bs.cs.isf.cbc.tool.unproven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-<<<<<<<< HEAD:EmailCorC/src/Client/getName.diagram
-        <businessObjects href="getName.cbcmodel#/0/@statement/@refinement"/>
-========
-        <businessObjects href="resetClients.cbcmodel#/0/@statement/@refinement"/>
->>>>>>>> master:EmailOO/src/Client/resetClients.diagram
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" x="250" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="166" height="20" y="195" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement 1">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement1Header"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="166" height="20" x="332" y="195" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement 2">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement2Header"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="166" height="20" x="166" y="195" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="intermediate condition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="intermediateCondHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-        <points y="40"/>
-        <points x="500" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor2Line"/>
-        <points y="60"/>
-        <points x="500" y="60"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor3Line"/>
-        <points y="195"/>
-        <points x="500" y="195"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor4Line"/>
-        <points y="215"/>
-        <points x="500" y="215"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor5Line"/>
-        <points x="166" y="260"/>
-        <points x="332" y="260"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor6Line"/>
-        <points y="105"/>
-        <points x="250" y="105"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor7Line"/>
-        <points x="250" y="105"/>
-        <points x="500" y="105"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver1Line"/>
-        <points x="250" y="40"/>
-        <points x="250" y="195"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver2Line"/>
-        <points x="166" y="195"/>
-        <points x="166" y="350"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver3Line"/>
-        <points x="332" y="195"/>
-        <points x="332" y="350"/>
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-<<<<<<<< HEAD:EmailCorC/src/Client/getName.diagram
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.3" lineWidth="2" filled="true" transparency="0.0" width="300" height="100" x="-80" y="570" cornerHeight="20" cornerWidth="20">
-========
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="350" height="150" x="230" y="660" cornerHeight="20" cornerWidth="20">
->>>>>>>> master:EmailOO/src/Client/resetClients.diagram
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-<<<<<<<< HEAD:EmailCorC/src/Client/getName.diagram
-      <businessObjects href="getName.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement"/>
-========
-      <businessObjects href="resetClients.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement"/>
->>>>>>>> master:EmailOO/src/Client/resetClients.diagram
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.2"/>
-    <children visible="true" active="true">
-<<<<<<<< HEAD:EmailCorC/src/Client/getName.diagram
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="100" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="result = null;">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getName.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement"/>
-========
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="116" height="110" x="116" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="index = 0;&#xD;&#xA;Client.clientCounter = 1;">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="resetClients.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement"/>
->>>>>>>> master:EmailOO/src/Client/resetClients.diagram
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-<<<<<<<< HEAD:EmailCorC/src/Client/getName.diagram
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{ true}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getName.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="200" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{intermediateCond}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getName.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="280" y="10" id="de.tu_bs.cs.isf.cbc.tool.unproven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getName.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="100" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
-========
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="116" height="72" y="76" horizontalAlignment="ALIGNMENT_CENTER" value="{Client.clients != null&amp; Client.clientCounter >= 0 &amp; Client.clients != null}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="resetClients.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="116" height="36" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable();">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preConditionModifiables"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="resetClients.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="116" height="72" x="232" y="76" horizontalAlignment="ALIGNMENT_CENTER" value="{index = 0 &amp; Client.clientCounter = 1}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="resetClients.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="116" height="36" x="232" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable(Client.clientCounter, index);">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postConditionModifiables"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="resetClients.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="330" y="10" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="resetClients.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="116" height="20" x="116" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Statement">
->>>>>>>> master:EmailOO/src/Client/resetClients.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-<<<<<<<< HEAD:EmailCorC/src/Client/getName.diagram
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-========
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="116" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
->>>>>>>> master:EmailOO/src/Client/resetClients.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-<<<<<<<< HEAD:EmailCorC/src/Client/getName.diagram
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="200" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-========
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="116" height="20" x="232" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
->>>>>>>> master:EmailOO/src/Client/resetClients.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerSeparater"/>
-        <points y="40"/>
-<<<<<<<< HEAD:EmailCorC/src/Client/getName.diagram
-        <points x="300" y="40"/>
-========
-        <points x="350" y="40"/>
->>>>>>>> master:EmailOO/src/Client/resetClients.diagram
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preSep"/>
-<<<<<<<< HEAD:EmailCorC/src/Client/getName.diagram
-        <points x="200"/>
-        <points x="200" y="100"/>
-========
-        <points x="232"/>
-        <points x="232" y="150"/>
->>>>>>>> master:EmailOO/src/Client/resetClients.diagram
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postSep"/>
-<<<<<<<< HEAD:EmailCorC/src/Client/getName.diagram
-        <points x="100"/>
-        <points x="100" y="100"/>
-========
-        <points x="116"/>
-        <points x="116" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-        <points y="76"/>
-        <points x="116" y="76"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor2Line"/>
-        <points x="232" y="76"/>
-        <points x="350" y="76"/>
->>>>>>>> master:EmailOO/src/Client/resetClients.diagram
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-<<<<<<<< HEAD:EmailCorC/src/Client/getName.diagram
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.3" lineWidth="2" filled="true" transparency="0.0" width="500" height="300" x="320" y="570" cornerHeight="20" cornerWidth="20">
-========
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="450" height="350" x="810" y="680" cornerHeight="20" cornerWidth="20">
->>>>>>>> master:EmailOO/src/Client/resetClients.diagram
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-<<<<<<<< HEAD:EmailCorC/src/Client/getName.diagram
-      <businessObjects href="getName.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement"/>
-========
-      <businessObjects href="resetClients.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement"/>
->>>>>>>> master:EmailOO/src/Client/resetClients.diagram
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.1"/>
-    <children visible="true" active="true">
-<<<<<<<< HEAD:EmailCorC/src/Client/getName.diagram
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="100" y="200" horizontalAlignment="ALIGNMENT_CENTER" value="statement1">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement1NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getName.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement"/>
-========
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="186" x="150" y="164" horizontalAlignment="ALIGNMENT_CENTER" value="loop">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementRepNameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="resetClients.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@loopStatement"/>
->>>>>>>> master:EmailOO/src/Client/resetClients.diagram
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.0"/>
-    </children>
-    <children visible="true" active="true">
-<<<<<<<< HEAD:EmailCorC/src/Client/getName.diagram
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="100" x="166" y="200" horizontalAlignment="ALIGNMENT_CENTER" value="{intermediateCond}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="conditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getName.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@intermediateCondition"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="100" x="332" y="200" horizontalAlignment="ALIGNMENT_CENTER" value="statement2">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement2NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getName.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement"/>
-========
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="83" x="150" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="index &lt; Client.clients.length">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="conditionRepText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="resetClients.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@guard"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="83" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="(\forall int k;(((k>=0 &amp; k&lt;index &amp; k&lt; Client.clients.length) -> Client.clients[k] = null))) &amp; Client.clientCounter = 1&#xD;&#xA;&amp; index >= 0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="invariantRepText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="resetClients.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@invariant"/>
->>>>>>>> master:EmailOO/src/Client/resetClients.diagram
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.4"/>
-    </children>
-<<<<<<<< HEAD:EmailCorC/src/Client/getName.diagram
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="500" height="60" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Composition">
-========
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="83" x="300" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="Client.clients.length-index">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variantRepText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="resetClients.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@variant"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="450" height="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="RepetitionStatement DO...OD">
->>>>>>>> master:EmailOO/src/Client/resetClients.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="nameText"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-<<<<<<<< HEAD:EmailCorC/src/Client/getName.diagram
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="100" y="80" horizontalAlignment="ALIGNMENT_CENTER" value="{intermediateCond}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="pre1NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getName.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="100" x="250" y="80" horizontalAlignment="ALIGNMENT_CENTER" value="{ (this.name != null -> result = this.name) &amp; (this.name = null -> result = null)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="post2NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getName.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="480" y="10" id="de.tu_bs.cs.isf.cbc.tool.unproven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getName.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" y="60" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-========
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="124" y="226" horizontalAlignment="ALIGNMENT_CENTER" value="{((\forall int k;(((k>=0 &amp; k&lt;index &amp; k&lt; Client.clients.length) -> Client.clients[k] = null))) &amp; Client.clientCounter = 1&#xD;&#xA;&amp; index >= 0) &amp; (index &lt; Client.clients.length)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preNameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="resetClients.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@loopStatement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="62" y="164" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable(Client.clientCounter, index);">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preConditionModifiables"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="resetClients.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="124" x="300" y="226" horizontalAlignment="ALIGNMENT_CENTER" value="{(\forall int k;(((k>=0 &amp; k&lt;index &amp; k&lt; Client.clients.length) -> Client.clients[k] = null))) &amp; Client.clientCounter = 1&#xD;&#xA;&amp; index >= 0}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postNameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="resetClients.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@loopStatement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="62" x="300" y="164" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable(Client.clientCounter, Client.clients[index], index);">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postConditionModifiables"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="resetClients.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@loopStatement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="430" y="10" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="resetClients.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="300" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="variant">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variantHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="invariant">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="invariantHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="150" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="guard">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="guardHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="150" y="144" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="loop statement">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="loopHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="300" y="144" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" y="144" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
->>>>>>>> master:EmailOO/src/Client/resetClients.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-<<<<<<<< HEAD:EmailCorC/src/Client/getName.diagram
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" x="250" y="60" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="166" height="20" y="180" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement 1">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement1Header"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="166" height="20" x="332" y="180" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement 2">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement2Header"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="166" height="20" x="166" y="180" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="intermediate condition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="intermediateCondHeader"/>
-========
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver1SEP"/>
-        <points x="150" y="40"/>
-        <points x="150" y="350"/>
->>>>>>>> master:EmailOO/src/Client/resetClients.diagram
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-<<<<<<<< HEAD:EmailCorC/src/Client/getName.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-        <points y="60"/>
-        <points x="500" y="60"/>
-========
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver2SEP"/>
-        <points x="300" y="40"/>
-        <points x="300" y="350"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1SEP"/>
-        <points y="60"/>
-        <points x="450" y="60"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor2SEP"/>
-        <points y="40"/>
-        <points x="450" y="40"/>
->>>>>>>> master:EmailOO/src/Client/resetClients.diagram
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-<<<<<<<< HEAD:EmailCorC/src/Client/getName.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor2Line"/>
-        <points y="80"/>
-        <points x="500" y="80"/>
-========
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor3SEP"/>
-        <points y="144"/>
-        <points x="450" y="144"/>
->>>>>>>> master:EmailOO/src/Client/resetClients.diagram
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-<<<<<<<< HEAD:EmailCorC/src/Client/getName.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor3Line"/>
-        <points y="180"/>
-        <points x="500" y="180"/>
-========
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor4SEP"/>
-        <points y="164"/>
-        <points x="450" y="164"/>
->>>>>>>> master:EmailOO/src/Client/resetClients.diagram
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-<<<<<<<< HEAD:EmailCorC/src/Client/getName.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor4Line"/>
-        <points y="200"/>
-        <points x="500" y="200"/>
-========
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor5SEP"/>
-        <points y="226"/>
-        <points x="150" y="226"/>
->>>>>>>> master:EmailOO/src/Client/resetClients.diagram
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-<<<<<<<< HEAD:EmailCorC/src/Client/getName.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver1Line"/>
-        <points x="250" y="60"/>
-        <points x="250" y="180"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver2Line"/>
-        <points x="166" y="180"/>
-        <points x="166" y="300"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver3Line"/>
-        <points x="332" y="180"/>
-        <points x="332" y="300"/>
-========
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor6SEP"/>
-        <points x="300" y="226"/>
-        <points x="450" y="226"/>
->>>>>>>> master:EmailOO/src/Client/resetClients.diagram
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-<<<<<<<< HEAD:EmailCorC/src/Client/getName.diagram
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.3" lineWidth="2" filled="true" transparency="0.0" width="300" height="100" x="220" y="920" cornerHeight="20" cornerWidth="20">
-========
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="350" height="150" x="690" y="1070" cornerHeight="20" cornerWidth="20">
->>>>>>>> master:EmailOO/src/Client/resetClients.diagram
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-<<<<<<<< HEAD:EmailCorC/src/Client/getName.diagram
-      <businessObjects href="getName.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement"/>
-========
-      <businessObjects href="resetClients.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@loopStatement/@refinement"/>
->>>>>>>> master:EmailOO/src/Client/resetClients.diagram
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.0"/>
-    <children visible="true" active="true">
-<<<<<<<< HEAD:EmailCorC/src/Client/getName.diagram
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="100" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="result = this.name;">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getName.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement"/>
-========
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="116" height="110" x="116" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="Client.clients[index] = null;&#xD;&#xA;index++;">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="resetClients.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@loopStatement/@refinement"/>
->>>>>>>> master:EmailOO/src/Client/resetClients.diagram
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-<<<<<<<< HEAD:EmailCorC/src/Client/getName.diagram
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{intermediateCond}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getName.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="200" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{intermediateCond}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getName.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="280" y="10" id="de.tu_bs.cs.isf.cbc.tool.unproven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getName.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@firstStatement/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="100" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
-========
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="116" height="72" y="76" horizontalAlignment="ALIGNMENT_CENTER" value="{((\forall int k;(((k>=0 &amp; k&lt;index &amp; k&lt; Client.clients.length) -> Client.clients[k] = null))) &amp; Client.clientCounter = 1&#xD;&#xA;&amp; index >= 0) &amp; (index &lt; Client.clients.length)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="resetClients.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@loopStatement/@refinement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="116" height="36" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable(Client.clientCounter, index);">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preConditionModifiables"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="resetClients.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@loopStatement/@refinement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="116" height="72" x="232" y="76" horizontalAlignment="ALIGNMENT_CENTER" value="{(\forall int k;(((k>=0 &amp; k&lt;index &amp; k&lt; Client.clients.length) -> Client.clients[k] = null))) &amp; Client.clientCounter = 1&#xD;&#xA;&amp; index >= 0}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="resetClients.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@loopStatement/@refinement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="116" height="36" x="232" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable(Client.clientCounter, Client.clients[index], index);">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postConditionModifiables"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="resetClients.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@loopStatement/@refinement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="330" y="10" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="resetClients.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@loopStatement/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="116" height="20" x="116" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Statement">
->>>>>>>> master:EmailOO/src/Client/resetClients.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-<<<<<<<< HEAD:EmailCorC/src/Client/getName.diagram
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-========
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="116" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
->>>>>>>> master:EmailOO/src/Client/resetClients.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-<<<<<<<< HEAD:EmailCorC/src/Client/getName.diagram
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="200" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-========
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="116" height="20" x="232" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
->>>>>>>> master:EmailOO/src/Client/resetClients.diagram
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerSeparater"/>
-        <points y="40"/>
-<<<<<<<< HEAD:EmailCorC/src/Client/getName.diagram
-        <points x="300" y="40"/>
-========
-        <points x="350" y="40"/>
->>>>>>>> master:EmailOO/src/Client/resetClients.diagram
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preSep"/>
-<<<<<<<< HEAD:EmailCorC/src/Client/getName.diagram
-        <points x="200"/>
-        <points x="200" y="100"/>
-========
-        <points x="232"/>
-        <points x="232" y="150"/>
->>>>>>>> master:EmailOO/src/Client/resetClients.diagram
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postSep"/>
-<<<<<<<< HEAD:EmailCorC/src/Client/getName.diagram
-        <points x="100"/>
-        <points x="100" y="100"/>
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.3" lineWidth="2" filled="true" transparency="0.0" width="300" height="100" x="620" y="920" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="getName.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.4"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="100" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="result = result;">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getName.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{intermediateCond}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getName.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="60" x="200" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{ (this.name != null -> result = this.name) &amp; (this.name = null -> result = null)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getName.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="280" y="10" id="de.tu_bs.cs.isf.cbc.tool.unproven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getName.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@secondStatement/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="100" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="ReturnStatement">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="200" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerSeparater"/>
-        <points y="40"/>
-        <points x="300" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preSep"/>
-        <points x="200"/>
-        <points x="200" y="100"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postSep"/>
-        <points x="100"/>
-        <points x="100" y="100"/>
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" lineWidth="1" filled="true" transparency="0.0" width="200" height="100" x="600" y="20" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="getName.cbcmodel#/1"/>
-    </link>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="12" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Variables">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variablesName"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getName.cbcmodel#/1"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-        <points y="12"/>
-        <points x="200" y="12"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="12" y="12" horizontalAlignment="ALIGNMENT_CENTER" value="PRIVATE String name">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Client.cbcclass#//@fields.0"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="12" y="24" horizontalAlignment="ALIGNMENT_CENTER" value="PRIVATE int id">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Client.cbcclass#//@fields.1"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="12" y="36" horizontalAlignment="ALIGNMENT_CENTER" value="PRIVATE static Client[] clients">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="2"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Client.cbcclass#//@fields.2"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="12" y="48" horizontalAlignment="ALIGNMENT_CENTER" value="PRIVATE static int clientCounter">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="3"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Client.cbcclass#//@fields.3"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="12" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="PRIVATE static int old_clientCounter">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="4"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Client.cbcclass#//@fields.4"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="12" y="72" horizontalAlignment="ALIGNMENT_CENTER" value="RETURN String result">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="5"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getName.cbcmodel#/1/@variables.0"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="12" y="84" horizontalAlignment="ALIGNMENT_CENTER" value="LOCAL String result">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="6"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getName.cbcmodel#/1/@variables.1"/>
-      </link>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" lineWidth="1" filled="true" transparency="0.0" width="200" height="100" x="600" y="220" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="getName.cbcmodel#/2"/>
-    </link>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="100" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Global Conditions">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="globalConditionsName"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="getName.cbcmodel#/2"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-        <points y="100"/>
-        <points x="200" y="100"/>
-========
-        <points x="116"/>
-        <points x="116" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-        <points y="76"/>
-        <points x="116" y="76"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor2Line"/>
-        <points x="232" y="76"/>
-        <points x="350" y="76"/>
->>>>>>>> master:EmailOO/src/Client/resetClients.diagram
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.4/@children.0/@anchors.0" end="//@children.5/@anchors.0">
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.2/@children.3/@anchors.0" end="//@children.4/@anchors.0">
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.2/@children.0/@anchors.0" end="//@children.3/@anchors.0">
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@children.2/@anchors.0" end="//@children.2/@anchors.0">
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.3/@children.2/@anchors.0" end="//@children.5/@anchors.0">
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-  <colors red="227" green="238" blue="249"/>
-  <colors red="255" green="255" blue="255"/>
-  <colors green="127"/>
-  <colors red="255"/>
-  <colors/>
-  <fonts name="Arial" size="9" bold="true"/>
-</pi:Diagram>
diff --git a/IntegerListOO/.classpath.orig b/IntegerListOO/.classpath.orig
deleted file mode 100644
index e679e5690..000000000
--- a/IntegerListOO/.classpath.orig
+++ /dev/null
@@ -1,29 +0,0 @@
-<<<<<<< HEAD
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
-=======
-<<<<<<<< HEAD:de.tu_bs.cs.isf.cbc.statistics.ui/.classpath
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
-========
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-16">
-		<attributes>
-			<attribute name="module" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
->>>>>>>> master:IntegerListOO/.classpath
->>>>>>> master
diff --git a/IntegerListOO/.project.orig b/IntegerListOO/.project.orig
deleted file mode 100644
index 8ffa1f833..000000000
--- a/IntegerListOO/.project.orig
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-<<<<<<< HEAD
-	<name>IntegerListOO</name>
-=======
-<<<<<<<< HEAD:EmailCorC/.project
-	<name>EmailCorC</name>
-========
-	<name>IntegerListOO</name>
->>>>>>>> master:IntegerListOO/.project
->>>>>>> master
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-<<<<<<< HEAD
-			<name>de.ovgu.featureide.core.extensibleFeatureProjectBuilder</name>
-			<arguments>
-				<dictionary>
-					<key>build</key>
-					<value>src</value>
-				</dictionary>
-				<dictionary>
-					<key>composer</key>
-					<value>de.ovgu.featureide.composer.ahead</value>
-				</dictionary>
-				<dictionary>
-					<key>equations</key>
-					<value>configs</value>
-				</dictionary>
-				<dictionary>
-					<key>source</key>
-					<value>features</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-=======
->>>>>>> master
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-<<<<<<< HEAD
-		<nature>de.ovgu.featureide.core.featureProjectNature</nature>
-=======
->>>>>>> master
-	</natures>
-</projectDescription>
diff --git a/IntegerListOO/src/.gitkeep.orig b/IntegerListOO/src/.gitkeep.orig
deleted file mode 100644
index bbf00c051..000000000
--- a/IntegerListOO/src/.gitkeep.orig
+++ /dev/null
@@ -1,6 +0,0 @@
-<<<<<<< HEAD
-/.gitkeep
-=======
-/.gitkeep
-/IntList.java
->>>>>>> master
diff --git a/de.tu-bs.cs.isf.cbc.exceptions/.classpath.orig b/de.tu-bs.cs.isf.cbc.exceptions/.classpath.orig
deleted file mode 100644
index 9a78ee038..000000000
--- a/de.tu-bs.cs.isf.cbc.exceptions/.classpath.orig
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-<<<<<<<< HEAD:EmailCorC/.classpath
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-========
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-16"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
->>>>>>>> master:de.tu-bs.cs.isf.cbc.exceptions/.classpath
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/de.tu-bs.cs.isf.cbc.exceptions/.project.orig b/de.tu-bs.cs.isf.cbc.exceptions/.project.orig
deleted file mode 100644
index e5342e7af..000000000
--- a/de.tu-bs.cs.isf.cbc.exceptions/.project.orig
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-<<<<<<<< HEAD:de.tu_bs.cs.isf.cbc.cbcclass.model/.project
-	<name>de.tu_bs.cs.isf.cbc.cbcclass.model</name>
-========
-	<name>de.tu-bs.cs.isf.cbc.exceptions</name>
->>>>>>>> master:de.tu-bs.cs.isf.cbc.exceptions/.project
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/de.tu-bs.cs.isf.cbc.model/META-INF/MANIFEST.MF.orig b/de.tu-bs.cs.isf.cbc.model/META-INF/MANIFEST.MF.orig
deleted file mode 100644
index 0ae9f4f96..000000000
--- a/de.tu-bs.cs.isf.cbc.model/META-INF/MANIFEST.MF.orig
+++ /dev/null
@@ -1,42 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: de.tu-bs.cs.isf.cbc.model;singleton:=true
-Automatic-Module-Name: de.tu-bs.cs.isf.cbc.model
-Bundle-Version: 0.1.0.qualifier
-Bundle-ClassPath: .
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-<<<<<<< HEAD
-Export-Package: de.tu_bs.cs.isf.cbc.cbcmodel,
- de.tu_bs.cs.isf.cbc.cbcmodel.impl,
- de.tu_bs.cs.isf.cbc.cbcmodel.util
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;visibility:=reexport,
- de.tu_bs.cs.isf.cbc.cbcclass.model;visibility:=reexport
-Bundle-ActivationPolicy: lazy
-Import-Package: de.tu_bs.cs.isf.cbc.util,
- helper
-=======
-Export-Package: de.tu_bs.cs.isf.cbc.cbcclass,
- de.tu_bs.cs.isf.cbc.cbcclass.impl,
- de.tu_bs.cs.isf.cbc.cbcclass.util,
- de.tu_bs.cs.isf.cbc.cbcmodel,
- de.tu_bs.cs.isf.cbc.cbcmodel.impl,
- de.tu_bs.cs.isf.cbc.cbcmodel.util
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.xtext,
- org.eclipse.xtext.xbase,
- org.eclipse.equinox.common;bundle-version="3.5.0",
- org.eclipse.xtext.common.types,
- org.eclipse.xtext.xbase.lib;bundle-version="2.13.0",
- org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
- org.objectweb.asm;bundle-version="[9.0.0,10.0.0)";resolution:=optional,
- org.eclipse.xtext.util,
- org.eclipse.xtend.lib;bundle-version="2.13.0",
- org.eclipse.emf.common,
- org.eclipse.emf.ecore;visibility:=reexport
-Import-Package: org.apache.log4j
-Bundle-ActivationPolicy: lazy
->>>>>>> master
diff --git a/de.tu-bs.cs.isf.cbc.model/build.properties.orig b/de.tu-bs.cs.isf.cbc.model/build.properties.orig
deleted file mode 100644
index 8ef2cb119..000000000
--- a/de.tu-bs.cs.isf.cbc.model/build.properties.orig
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-
-<<<<<<< HEAD
-=======
-source.. = src/,\
-           src-gen/,\
-           xtend-gen/
->>>>>>> master
-bin.includes = .,\
-               model/,\
-               META-INF/,\
-               plugin.xml,\
-               plugin.properties
-<<<<<<< HEAD
-jars.compile.order = .
-source.. = src/
-output.. = bin/
-=======
-bin.excludes = **/*.mwe2,\
-               **/*.xtend
-jars.compile.order = .
-source.. = src-gen/,\
-           src
-output.. = bin/
-additional.bundles = org.eclipse.xtext.xbase,\
-                     org.eclipse.xtext.common.types,\
-                     org.eclipse.xtext.xtext.generator,\
-                     org.eclipse.emf.codegen.ecore,\
-                     org.eclipse.emf.mwe.utils,\
-                     org.eclipse.emf.mwe2.launch,\
-                     org.eclipse.emf.mwe2.lib,\
-                     org.objectweb.asm,\
-                     org.apache.commons.logging,\
-                     org.apache.log4j,\
-                     com.ibm.icu
-                     
->>>>>>> master
diff --git a/de.tu-bs.cs.isf.cbc.model/model/cbcmodel.aird.orig b/de.tu-bs.cs.isf.cbc.model/model/cbcmodel.aird.orig
deleted file mode 100644
index 7c2c16ab0..000000000
--- a/de.tu-bs.cs.isf.cbc.model/model/cbcmodel.aird.orig
+++ /dev/null
@@ -1,4586 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.3/notation" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:viewpoint="http://www.eclipse.org/sirius/1.1.0" xsi:schemaLocation="http://www.eclipse.org/sirius/description/1.1.0 http://www.eclipse.org/sirius/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/style/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description/style">
-<<<<<<< HEAD
-  <viewpoint:DAnalysis uid="_oNTJkBhnEeu74r7X1vovKw" selectedViews="_oNTJkRhnEeu74r7X1vovKw _o7XwgBhnEeu74r7X1vovKw _o7nBEBhnEeu74r7X1vovKw _pBRkMBhnEeu74r7X1vovKw" version="14.5.0.202104161500">
-=======
-  <viewpoint:DAnalysis uid="_oNTJkBhnEeu74r7X1vovKw" selectedViews="_oNTJkRhnEeu74r7X1vovKw _o7XwgBhnEeu74r7X1vovKw _o7nBEBhnEeu74r7X1vovKw _pBRkMBhnEeu74r7X1vovKw" version="14.5.1.202106111100">
->>>>>>> master
-    <semanticResources>cbcmodel.ecore</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.EObject.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.String.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.EClass.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.resource.Resource.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.EStructuralFeature.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.EReference.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.util.EList.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.util.TreeIterator.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.Object.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.EOperation.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.notify.Notifier.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.EAttribute.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.EGenericType.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.EClassifier.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.EDataType.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.ETypeParameter.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.ENamedElement.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.EModelElement.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.EAnnotation.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.util.EMap.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.Map.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.Set.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.Collection.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.Iterator.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.Spliterator.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.stream.Stream.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.Iterable.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.stream.IntStream.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.function.ToIntFunction.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.stream.LongStream.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.function.ToLongFunction.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.stream.DoubleStream.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.function.ToDoubleFunction.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.function.IntFunction.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.Optional.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.function.Supplier.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.stream.Collector.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.stream.Stream$Builder.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.stream.BaseStream.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.function.IntToLongFunction.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.function.IntToDoubleFunction.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.function.IntBinaryOperator.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.OptionalInt.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.function.ObjIntConsumer.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.OptionalDouble.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.IntSummaryStatistics.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.Integer.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.stream.IntStream$Builder.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.function.IntSupplier.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.function.DoubleSupplier.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.Class.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.Comparable.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.Number.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.reflect.Constructor.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.ClassLoader.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.security.ProtectionDomain.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.ref.SoftReference.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.Class$ReflectionData.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.reflect.generics.repository.ClassRepository.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.io.ObjectStreamField.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.reflect.ReflectionFactory.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.Class$AnnotationData.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.reflect.annotation.AnnotationType.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.ClassValue$ClassValueMap.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.reflect.TypeVariable.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.reflect.Type.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.Package.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.reflect.Method.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.Class$EnclosingMethodInfo.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.reflect.Field.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.io.InputStream.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.net.URL.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.reflect.generics.factory.GenericsFactory.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.reflect.Executable.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.reflect.ConstantPool.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.Class$MethodArray.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.annotation.Annotation.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.reflect.AnnotatedType.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.io.Serializable.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.reflect.GenericDeclaration.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.reflect.generics.repository.ConstructorRepository.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.reflect.ConstructorAccessor.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.StringBuilder.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.reflect.generics.tree.MethodTypeSignature.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.reflect.generics.repository.GenericDeclRepository.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.reflect.generics.tree.FormalTypeParameter.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.reflect.generics.tree.TypeSignature.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.reflect.generics.tree.ReturnType.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.reflect.generics.tree.FieldTypeSignature.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.reflect.generics.visitor.Visitor.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.reflect.generics.tree.Signature.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.reflect.generics.visitor.TypeTreeVisitor.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.reflect.generics.tree.TypeTree.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.reflect.generics.tree.ClassTypeSignature.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.reflect.generics.tree.ArrayTypeSignature.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.reflect.generics.tree.TypeVariableSignature.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.reflect.generics.tree.Wildcard.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.reflect.generics.tree.SimpleClassTypeSignature.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.reflect.generics.tree.BottomSignature.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.reflect.generics.tree.ByteSignature.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.reflect.generics.tree.BooleanSignature.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.reflect.generics.tree.ShortSignature.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.reflect.generics.tree.CharSignature.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.reflect.generics.tree.IntSignature.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.reflect.generics.tree.LongSignature.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.reflect.generics.tree.FloatSignature.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.reflect.generics.tree.DoubleSignature.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.reflect.generics.tree.VoidDescriptor.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.List.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.ListIterator.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.reflect.generics.tree.TypeArgument.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.reflect.generics.tree.BaseType.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.reflect.generics.tree.Tree.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.reflect.generics.tree.ClassSignature.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.reflect.generics.repository.AbstractRepository.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.reflect.generics.visitor.Reifier.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.StringBuffer.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.io.ObjectOutputStream.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.AbstractStringBuilder.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.io.ObjectOutputStream$BlockDataOutputStream.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.io.ObjectOutputStream$HandleTable.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.io.ObjectOutputStream$ReplaceTable.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.io.SerialCallbackContext.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.io.ObjectOutputStream$PutFieldImpl.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.io.ObjectOutputStream$DebugTraceInfoStack.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.io.OutputStream.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.io.ObjectOutputStream$PutField.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.io.ObjectStreamClass.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.Enum.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.io.Externalizable.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.io.IOException.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.io.ObjectOutput.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.io.ObjectStreamConstants.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.io.DataOutputStream.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.io.DataOutput.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.io.FilterOutputStream.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.Thread.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.Runnable.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.ThreadGroup.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.security.AccessControlContext.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.ThreadLocal$ThreadLocalMap.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.nio.ch.Interruptible.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.StackTraceElement.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.RuntimePermission.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.Thread$UncaughtExceptionHandler.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.Throwable.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.Thread$State.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.ref.ReferenceQueue.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.ref.WeakReference.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.Void.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.io.PrintStream.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.Formatter.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.io.BufferedWriter.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.io.OutputStreamWriter.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.nio.charset.Charset.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.io.File.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.Locale.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.Appendable.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.io.Closeable.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.Formatter$FormatString.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.io.Flushable.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.io.Writer.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.nio.cs.StreamEncoder.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.nio.charset.CharsetEncoder.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.nio.ByteBuffer.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.nio.channels.WritableByteChannel.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.nio.ByteOrder.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.nio.ShortBuffer.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.nio.IntBuffer.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.nio.LongBuffer.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.nio.FloatBuffer.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.nio.DoubleBuffer.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.nio.Buffer.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.nio.channels.Channel.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.nio.charset.CodingErrorAction.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.nio.charset.CharsetDecoder.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.nio.charset.CoderResult.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.nio.charset.CoderResult$Cache.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.nio.charset.spi.CharsetProvider.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.ThreadLocal.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.SortedMap.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.concurrent.atomic.AtomicInteger.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.misc.Unsafe.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.io.FileSystem.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.io.File$PathStatus.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.nio.file.Path.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.net.URI.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.io.FilenameFilter.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.io.FileFilter.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.nio.file.FileSystem.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.nio.file.LinkOption.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.nio.file.WatchKey.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.nio.file.WatchService.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.nio.file.WatchEvent$Kind.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.nio.file.WatchEvent$Modifier.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.nio.file.Watchable.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.nio.file.spi.FileSystemProvider.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.nio.file.FileStore.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.nio.file.PathMatcher.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.nio.file.attribute.UserPrincipalLookupService.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.nio.file.OpenOption.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.nio.channels.FileChannel.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.nio.file.attribute.FileAttribute.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.nio.channels.AsynchronousFileChannel.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.concurrent.ExecutorService.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.nio.channels.SeekableByteChannel.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.nio.file.DirectoryStream.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.nio.file.DirectoryStream$Filter.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.nio.file.CopyOption.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.nio.file.AccessMode.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.nio.file.attribute.FileAttributeView.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.nio.file.attribute.BasicFileAttributes.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.nio.channels.ReadableByteChannel.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.nio.MappedByteBuffer.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.nio.channels.FileChannel$MapMode.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.nio.channels.FileLock.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.nio.channels.GatheringByteChannel.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.nio.channels.ScatteringByteChannel.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.nio.channels.spi.AbstractInterruptibleChannel.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.io.FileDescriptor.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.AutoCloseable.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.nio.channels.InterruptibleChannel.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.nio.channels.CompletionHandler.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.concurrent.Future.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.nio.channels.AsynchronousChannel.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.concurrent.TimeUnit.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.concurrent.Callable.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.concurrent.Executor.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.nio.channels.ByteChannel.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.nio.file.attribute.AttributeView.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.nio.file.attribute.FileTime.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.nio.file.attribute.FileStoreAttributeView.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.nio.file.attribute.UserPrincipal.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.nio.file.attribute.GroupPrincipal.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.security.Principal.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/javax.security.auth.Subject.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.security.PrivilegedAction.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.security.PrivilegedExceptionAction.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.nio.file.WatchEvent.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.Locale$Cache.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.util.locale.BaseLocale.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.util.locale.LocaleExtensions.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.Locale$Category.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.Character.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.text.MessageFormat.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.Locale$LanguageRange.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.Locale$FilteringMode.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.Cloneable.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.Locale$LocaleKey.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.util.locale.LocaleObjectCache.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.util.locale.LocaleObjectCache$CacheEntry.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.util.locale.BaseLocale$Cache.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.util.locale.BaseLocale$Key.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.util.locale.Extension.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.util.locale.InternalLocaleBuilder$CaseInsensitiveChar.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.util.locale.InternalLocaleBuilder$CaseInsensitiveString.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.text.Format.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.text.FieldPosition.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.text.AttributedCharacterIterator.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.text.ParsePosition.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.text.CharacterIterator.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.text.AttributedCharacterIterator$Attribute.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.text.Format$Field.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.text.Format$FieldDelegate.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.security.DomainCombiner.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.security.Permission.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.security.util.Debug.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.security.PermissionCollection.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.security.Guard.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.Enumeration.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.math.BigInteger.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.Random.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.concurrent.atomic.AtomicLong.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.function.LongBinaryOperator.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.ThreadLocal$ThreadLocalMap$Entry.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.security.BasicPermission.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.Throwable$PrintStreamOrWriter.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.io.PrintWriter.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.ref.ReferenceQueue$Lock.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.ref.Reference.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.ref.Reference$Lock.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.Long.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.ClassNotFoundException.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.io.ObjectStreamClass$ExceptionInfo.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.io.ObjectStreamClass$FieldReflector.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.io.ObjectStreamClass$ClassDataSlot.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.ReflectiveOperationException.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.Exception.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.io.InvalidClassException.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.io.ObjectStreamException.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.io.ObjectInput.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.io.DataInput.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.io.SerializablePermission.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.concurrent.ConcurrentHashMap.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.security.cert.Certificate.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.Vector.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.HashMap.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.ClassLoader$NativeLibrary.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.Stack.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.Boolean.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.security.CodeSource.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.misc.URLClassPath.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.AssertionStatusDirectives.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.concurrent.ConcurrentHashMap$Node.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.concurrent.ConcurrentHashMap$CounterCell.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.concurrent.ConcurrentHashMap$KeySetView.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.concurrent.ConcurrentHashMap$ValuesView.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.concurrent.ConcurrentHashMap$EntrySetView.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.function.ToDoubleBiFunction.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.function.DoubleBinaryOperator.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.function.ToLongBiFunction.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.function.ToIntBiFunction.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.AbstractMap.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.concurrent.ConcurrentHashMap$CollectionView.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.security.PublicKey.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.security.Provider.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.security.Key.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.security.Provider$ServiceKey.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.security.Provider$Service.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.security.Provider$EngineDescription.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.Properties.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.security.Provider$UString.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.io.Reader.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.Properties$LineReader.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.Hashtable.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.Readable.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.Hashtable$Entry.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.Dictionary.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.RandomAccess.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.AbstractList.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.AbstractCollection.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.HashMap$Node.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.HashMap$TreeNode.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.LinkedHashMap$Entry.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.security.CodeSigner.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.net.SocketPermission.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.security.cert.CertificateFactory.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.security.cert.CertPath.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.security.Timestamp.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.Date.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.util.calendar.BaseCalendar.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.util.calendar.BaseCalendar$Date.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.util.calendar.CalendarDate.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.util.calendar.AbstractCalendar.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.util.calendar.Era.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.TimeZone.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.time.ZoneId.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.time.ZoneOffset.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.time.temporal.TemporalAccessor.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.time.format.TextStyle.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.time.zone.ZoneRules.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.time.temporal.TemporalField.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.time.temporal.ValueRange.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.time.temporal.TemporalQuery.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.time.temporal.Temporal.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.time.temporal.TemporalAdjuster.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.time.temporal.TemporalUnit.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.time.format.ResolverStyle.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.time.Duration.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.time.temporal.TemporalAmount.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.math.BigDecimal.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.math.BigDecimal$StringBuilderHelper.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.math.MathContext.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.math.RoundingMode.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.math.MutableBigInteger.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.time.zone.ZoneOffsetTransitionRule.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.time.zone.ZoneOffsetTransition.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.time.Month.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.time.DayOfWeek.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.time.zone.ZoneOffsetTransitionRule$TimeDefinition.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.util.calendar.CalendarSystem.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.util.calendar.Gregorian.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.util.calendar.Gregorian$Date.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.net.InetAddress.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.net.InetAddress$InetAddressHolder.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.net.spi.nameservice.NameService.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.net.InetAddress$Cache.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.net.InetAddressImpl.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.net.NetworkInterface.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.LinkedHashMap.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.net.InetAddress$CacheEntry.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.net.InetAddress$Cache$Type.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.net.InterfaceAddress.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.net.Inet4Address.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.security.cert.CertificateFactorySpi.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.security.cert.CRL.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.ArrayList.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.misc.URLClassPath$Loader.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.net.URLStreamHandler.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.net.URLStreamHandlerFactory.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.misc.Resource.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.jar.JarFile.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.jar.Manifest.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.jar.JarEntry.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.jar.JarVerifier.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.zip.ZipEntry.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.zip.ZipFile.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.jar.Attributes.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.jar.Attributes$Name.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.jar.Manifest$FastInputStream.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.io.FilterInputStream.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.security.util.SignatureFileVerifier.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.io.ByteArrayOutputStream.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.security.util.ManifestDigester.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.security.util.ManifestEntryVerifier.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.security.pkcs.PKCS7.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.security.MessageDigest.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.security.pkcs.SignerInfo.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.security.util.ObjectIdentifier.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.security.x509.AlgorithmId.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.security.pkcs.ContentInfo.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.security.cert.X509Certificate.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.security.cert.X509CRL.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.security.util.DerInputStream.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.security.util.DerValue.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.security.util.DerOutputStream.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.security.x509.X500Name.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.security.timestamp.Timestamper.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.security.util.DerInputBuffer.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.security.util.BitArray.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.io.ByteArrayInputStream.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.security.AlgorithmParameters.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.security.util.DerEncoder.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.security.AlgorithmParametersSpi.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.security.spec.AlgorithmParameterSpec.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/javax.security.auth.x500.X500Principal.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.security.cert.X509Extension.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.security.cert.X509CRLEntry.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.security.cert.CRLReason.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.security.util.ByteArrayLexOrder.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.security.util.ByteArrayTagOrder.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.security.x509.RDN.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.security.x509.AVA.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.security.x509.GeneralNameInterface.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.Byte.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.security.timestamp.TSResponse.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.security.timestamp.TSRequest.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.security.timestamp.TimestampToken.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.security.MessageDigestSpi.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.security.pkcs.PKCS9Attributes.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.security.pkcs.PKCS9Attribute.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.security.util.ManifestDigester$Entry.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.security.util.ManifestDigester$Position.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.zip.ZipConstants.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.zip.ZipCoder.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.zip.Inflater.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.Deque.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.zip.ZStreamRef.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.Queue.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.net.URLConnection.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.net.Proxy.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.net.www.MessageHeader.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.net.FileNameMap.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.net.ContentHandlerFactory.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.net.ContentHandler.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.net.Proxy$Type.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.net.SocketAddress.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.security.ProtectionDomain$Key.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.reflect.LangReflectAccess.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.reflect.FieldAccessor.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.reflect.MethodAccessor.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.annotation.RetentionPolicy.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.ClassValue$Entry.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.ClassValue.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.WeakHashMap.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.ClassValue$Identity.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.ClassValue$Version.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.WeakHashMap$Entry.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.reflect.generics.repository.MethodRepository.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.reflect.generics.repository.FieldRepository.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.reflect.Member.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.reflect.AccessibleObject.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.net.UrlDeserializedState.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.SecurityManager.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.reflect.ParameterizedType.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.reflect.WildcardType.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.reflect.Parameter.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.function.LongFunction.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.function.LongToIntFunction.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.function.LongToDoubleFunction.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.OptionalLong.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.function.ObjLongConsumer.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.LongSummaryStatistics.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.stream.LongStream$Builder.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.function.LongSupplier.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.function.DoubleFunction.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.function.DoubleToIntFunction.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.function.DoubleToLongFunction.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.function.ObjDoubleConsumer.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.DoubleSummaryStatistics.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.Double.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.stream.DoubleStream$Builder.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.stream.Collector$Characteristics.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.EPackage.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.EFactory.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.resource.ResourceSet.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.util.URI.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.resource.Resource$Diagnostic.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.notify.AdapterFactory.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.resource.Resource$Factory$Registry.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.resource.URIConverter.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.EPackage$Registry.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.notify.Adapter.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.notify.Notification.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.resource.Resource$Factory.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.resource.URIHandler.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.resource.ContentHandler.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.util.URI$URIPool.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.util.URI$URIPool$StringAccessUnit$Queue.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.util.URI$URIPool$PlatformAccessUnit$Queue.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.util.URI$URIPool$FileAccessUnit$Queue.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.util.URI$URIPool$URIComponentsAccessUnit$Queue.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.util.Pool.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.util.URI$URIPool$StringAccessUnit.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.util.Pool$AccessUnit.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.util.Pool$AccessUnit$Queue.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.util.SegmentSequence$StringArrayPool$SubstringAccessUnit.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.util.SegmentSequence$StringArrayPool$SegmentsAndSubsegmentAccessUnit.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.util.URI$URIPool$URIPoolAccessUnitBase.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.util.SegmentSequence$StringArrayPool$SubstringAccessUnit$Queue.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.util.SegmentSequence$StringArrayPool$AccessUnitBase.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.util.CommonUtil$StringPool$StringAccessUnit.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.util.CommonUtil$StringPool$SubstringAccessUnit.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.util.CommonUtil$StringPool.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.util.Pool$ObjectAccessUnit.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.util.CommonUtil$StringPool$StringAccessUnit$Queue.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.util.CommonUtil$StringPool$AccessUnitBase.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.util.CommonUtil$StringPool$CharactersAccessUnit$Queue.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.util.CommonUtil$StringPool$SubstringAccessUnit$Queue.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.util.CommonUtil$StringPool$CharSequenceAccessUnit$Queue.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.util.CommonUtil$StringPool$JavaInterningAccessUnit$Queue.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.util.CommonUtil$StringPool$StringsAccessUnit$Queue.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.util.WeakInterningHashSet$Entry.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.util.CommonUtil$StringPool$StringsAccessUnit.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.util.CommonUtil$StringPool$CharactersAccessUnit.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.util.CommonUtil$StringPool$CharSequenceAccessUnit.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.util.CommonUtil$StringPool$JavaInterningAccessUnit.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.util.WeakInterningHashSet.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.util.InterningSet.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.AbstractSet.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.util.SegmentSequence$StringArrayPool$SegmentsAndSubsegmentAccessUnit$Queue.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.util.CommonUtil$StringPool$StringPoolEntry.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.util.SegmentSequence$StringArrayPool$SegmentsAndSegmentCountAccessUnit.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.util.SegmentSequence$StringArrayPool$SegmentsAndSegmentCountAccessUnit$Queue.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.concurrent.atomic.AtomicReference.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.util.URI$URIPool$PlatformAccessUnit.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.util.URI$URIPool$FileAccessUnit.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.util.URI$URIPool$URIComponentsAccessUnit.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.util.SegmentSequence$StringArrayPool$SegmentsAccessUnit.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.util.SegmentSequence$StringArrayPool$SegmentsAccessUnit$Queue.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.concurrent.locks.ReentrantReadWriteLock.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.concurrent.locks.Lock.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.concurrent.locks.ReentrantReadWriteLock$ReadLock.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.concurrent.locks.ReentrantReadWriteLock$WriteLock.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.concurrent.locks.ReentrantReadWriteLock$Sync.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.concurrent.locks.Condition.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.concurrent.locks.ReadWriteLock.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.concurrent.locks.ReentrantReadWriteLock$Sync$ThreadLocalHoldCounter.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.concurrent.locks.ReentrantReadWriteLock$Sync$HoldCounter.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.IllegalMonitorStateException.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.concurrent.locks.AbstractQueuedSynchronizer$ConditionObject.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.concurrent.locks.AbstractQueuedSynchronizer.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.RuntimeException.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.concurrent.locks.AbstractQueuedSynchronizer$Node.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.concurrent.locks.AbstractOwnableSynchronizer.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.ETypedElement.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.EParameter.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/de.tu_bs.cs.isf.cbc.model.cbcmodel.CbcmodelPackage.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.impl.EFactoryImpl.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.plugin.EcorePlugin.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.EMFPlugin.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.Override.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.IllegalArgumentException.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.Deprecated.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.text.DateFormat.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.notify.NotificationChain.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.resource.impl.BinaryResourceImpl$DataConverter.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.InternalEObject.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.resource.impl.BinaryResourceImpl$DataConverter$Factory.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.impl.EModelElementImpl.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.Calendar.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.text.NumberFormat.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.util.locale.provider.LocaleProviderAdapter.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.text.DateFormatSymbols.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.Currency.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.HashSet.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.io.DataInputStream.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.util.locale.provider.LocaleProviderAdapter$Type.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.spi.LocaleServiceProvider.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.text.spi.BreakIteratorProvider.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.text.spi.CollatorProvider.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.text.spi.DateFormatProvider.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.text.spi.DateFormatSymbolsProvider.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.text.spi.DecimalFormatSymbolsProvider.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.text.spi.NumberFormatProvider.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.spi.CurrencyNameProvider.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.spi.LocaleNameProvider.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.spi.TimeZoneNameProvider.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.spi.CalendarDataProvider.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.spi.CalendarNameProvider.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.util.spi.CalendarProvider.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.util.locale.provider.LocaleResources.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.text.BreakIterator.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.text.BreakIterator$BreakIteratorCache.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.text.Collator.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.text.CollationKey.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.text.DecimalFormatSymbols.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.util.resources.LocaleData.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.util.locale.provider.LocaleResources$ResourceReference.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.util.locale.provider.ResourceBundleBasedAdapter.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.ResourceBundle.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.util.resources.OpenListResourceBundle.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.util.resources.TimeZoneNamesBundle.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.util.resources.ParallelListResourceBundle.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.concurrent.atomic.AtomicMarkableReference.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.concurrent.atomic.AtomicMarkableReference$Pair.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.ResourceBundle$CacheKey.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.ResourceBundle$BundleReference.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.spi.ResourceBundleControlProvider.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.ResourceBundle$Control.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.ResourceBundle$LoaderReference.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.ResourceBundle$CacheKeyReference.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.ResourceBundle$Control$CandidateListCache.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.resource.impl.BinaryResourceImpl$EObjectInputStream.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.resource.impl.BinaryResourceImpl$EObjectOutputStream.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.resource.impl.BinaryResourceImpl$EObjectInputStream$EPackageDataList.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.resource.impl.BinaryResourceImpl$EObjectInputStream$EPackageData.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.resource.impl.BinaryResourceImpl$EObjectInputStream$InternalEObjectList.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.resource.impl.BinaryResourceImpl$EObjectInputStream$URIList.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.util.BasicEList.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.resource.impl.BinaryResourceImpl$EObjectInputStream$StringList.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.resource.impl.BinaryResourceImpl$EObjectInputStream$EClassData.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.resource.impl.BinaryResourceImpl$EObjectInputStream$EStructuralFeatureData.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.util.InternalEList.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.util.FeatureMap$Internal.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.util.FeatureMap$Entry$Internal.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.resource.impl.BinaryResourceImpl$BinaryIO.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.util.AbstractEList.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.resource.impl.BinaryResourceImpl$BinaryIO$FeatureKind.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.EStructuralFeature$Setting.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.util.FeatureMap$Entry.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.util.FeatureMap$Internal$Wrapper.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.util.FeatureMap.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.util.FeatureMap$ValueListIterator.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.util.EContentsEList$FeatureListIterator.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.util.EContentsEList$FeatureIterator.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.resource.impl.BinaryResourceImpl$BinaryIO$Version.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.resource.impl.BinaryResourceImpl$EObjectOutputStream$EPackageData.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.resource.impl.BinaryResourceImpl$EObjectOutputStream$EClassData.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.resource.impl.BinaryResourceImpl$EObjectOutputStream$EStructuralFeatureData.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.resource.impl.BinaryResourceImpl$EObjectOutputStream$Check.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.resource.Resource$Internal.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.InternalEObject$EStore.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.impl.MinimalEObjectImpl.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.impl.BasicEObjectImpl$EPropertiesHolder.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.notify.impl.BasicNotifierImpl$EObservableAdapterList$Listener.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.EStructuralFeature$Internal$DynamicValueHolder.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.impl.BasicEObjectImpl.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.EStructuralFeature$Internal$SettingDelegate.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.EOperation$Internal$InvocationDelegate.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.notify.impl.BasicNotifierImpl.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.plugin.EcorePlugin$Implementation.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.util.ResourceLocator.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.osgi.framework.BundleContext.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.EMFPlugin$EclipsePlugin.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.osgi.framework.Bundle.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.osgi.framework.ServiceListener.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.osgi.framework.BundleListener.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.osgi.framework.FrameworkListener.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.osgi.framework.ServiceRegistration.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.osgi.framework.ServiceFactory.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.osgi.framework.ServiceReference.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.osgi.framework.ServiceObjects.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.osgi.framework.Filter.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.osgi.framework.BundleReference.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.osgi.framework.Version.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.osgi.framework.ServiceEvent.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.EventListener.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.EventObject.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.osgi.framework.BundleEvent.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.osgi.framework.FrameworkEvent.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.EMFPlugin$InternalHelper.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.core.runtime.IPluginDescriptor.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.util.Logger.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.EMFPlugin$InternalEclipsePlugin.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.core.runtime.Plugin.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.core.runtime.ILog.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.core.runtime.ILogListener.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.core.runtime.IStatus.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.core.runtime.IExtension.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.core.runtime.IExtensionPoint.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.core.runtime.IPluginPrerequisite.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.core.runtime.ILibrary.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.core.runtime.PluginVersionIdentifier.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.core.runtime.IPath.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.core.runtime.IConfigurationElement.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.core.runtime.IContributor.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.osgi.util.tracker.ServiceTracker.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.osgi.service.debug.DebugOptions.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.core.runtime.Preferences.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.osgi.framework.BundleActivator.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.osgi.util.tracker.ServiceTrackerCustomizer.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.osgi.util.tracker.ServiceTracker$Tracked.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.osgi.util.tracker.AbstractTracked.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.LinkedList.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.LinkedList$Node.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.AbstractSequentialList.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.osgi.service.debug.DebugTrace.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.core.runtime.ListenerList.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.core.runtime.Preferences$IPropertyChangeListener.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.core.runtime.Preferences$PropertyChangeEvent.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.util.DelegatingResourceLocator.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.impl.EPackageImpl.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.impl.ENamedElementImpl.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.EcorePackage.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.EcoreFactory.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.util.BasicExtendedMetaData$EPackageExtendedMetaData.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.EEnum.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.common.util.Enumerator.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.util.BasicExtendedMetaData$EPackageExtendedMetaData$Holder.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/org.eclipse.emf.ecore.EEnumLiteral.java</semanticResources>
-    <semanticResources>platform:/resource/de.tu_bs.cs.isf.cbc.language/model/language.ecore</semanticResources>
-    <semanticResources>http://www.eclipse.org/emf/2002/Ecore</semanticResources>
-    <semanticResources>platform:/resource/org.eclipse.xtext.xbase/model/Xbase.ecore</semanticResources>
-    <semanticResources>platform:/resource/org.eclipse.xtext.common.types/model/JavaVMTypes.ecore</semanticResources>
-    <semanticResources>platform:/resource/org.eclipse.xtext.xbase/model/Xbase.genmodel</semanticResources>
-    <semanticResources>platform:/resource/org.eclipse.xtext.common.types/model/JavaVMTypes.genmodel</semanticResources>
-    <semanticResources>platform:/resource/org.eclipse.xtext.xbase/model/XAnnotations.ecore</semanticResources>
-    <semanticResources>platform:/resource/org.eclipse.xtext.xbase/model/Xtype.ecore</semanticResources>
-    <semanticResources>../src-gen/de/tu_bs/cs/isf/cbc/cbcmodel/Kind.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.Collections.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.SortedSet.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.NavigableSet.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.util.NavigableMap.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.invoke.MethodHandle.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.io.OptionalDataException.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.invoke.MethodType.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.invoke.LambdaForm.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.invoke.BoundMethodHandle.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.invoke.MemberName.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.invoke.MethodHandleImpl$Intrinsic.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.invoke.MethodTypeForm.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.invoke.Invokers.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.invoke.MethodType$ConcurrentWeakInternSet.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.IndexOutOfBoundsException.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.invoke.LambdaForm$NamedFunction.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.invoke.WrongMethodTypeException.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.invoke.LambdaForm$BasicType.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.invoke.util.Wrapper.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.ClassCastException.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.invoke.MethodType$ConcurrentWeakInternSet$WeakEntry.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.security.util.DisabledAlgorithmConstraints.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.security.util.DisabledAlgorithmConstraints$Constraints.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.security.util.AlgorithmDecomposer.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.security.CryptoPrimitive.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.security.util.ConstraintsParameters.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.security.util.AbstractAlgorithmConstraints.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.security.util.DisabledAlgorithmConstraints$Constraint.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.security.AlgorithmConstraints.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/sun.security.util.ManifestDigester$Section.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.invoke.LambdaForm$Name.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.invoke.MemberName$Factory.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.invoke.LambdaFormEditor.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.invoke.LambdaFormEditor$Transform.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.invoke.LambdaFormBuffer.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.invoke.BoundMethodHandle$SpeciesData.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.invoke.LambdaFormEditor$Transform$Kind.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.invoke.MethodHandles$Lookup.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.invoke.DirectMethodHandle.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.invoke.MethodHandleInfo.java</semanticResources>
-    <semanticResources>pathmap:/javaclass/java.lang.IllegalAccessException.java</semanticResources>
-    <semanticResources>platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore</semanticResources>
-    <semanticResources>platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.genmodel</semanticResources>
-<<<<<<< HEAD
-    <semanticResources>cbcmodel.genmodel</semanticResources>
-    <ownedViews xmi:type="viewpoint:DView" uid="_oNTJkRhnEeu74r7X1vovKw">
-      <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']"/>
-      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_rIM0cBhnEeu74r7X1vovKw" name="cbcmodel class diagram" repPath="#_rIKYMBhnEeu74r7X1vovKw">
-        <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
-        <target xmi:type="ecore:EPackage" href="cbcmodel.ecore#/"/>
-      </ownedRepresentationDescriptors>
-      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_oHD-8FdCEeuHCOoWYWPwVw" name="cbcclass class diagram" repPath="#_oHCJwFdCEeuHCOoWYWPwVw">
-=======
-    <semanticResources>cbcclass.ecore</semanticResources>
-    <semanticResources>cbcmodel.genmodel</semanticResources>
-    <semanticResources>genmodel.genmodel</semanticResources>
-    <ownedViews xmi:type="viewpoint:DView" uid="_oNTJkRhnEeu74r7X1vovKw">
-      <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']"/>
-      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_rIM0cBhnEeu74r7X1vovKw" name="cbcmodel class diagram" repPath="#_rIKYMBhnEeu74r7X1vovKw" changeId="f5dc8d41-456b-4034-afa5-7ffe3e5e6300">
-        <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
-        <target xmi:type="ecore:EPackage" href="cbcmodel.ecore#/"/>
-      </ownedRepresentationDescriptors>
-      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_oHD-8FdCEeuHCOoWYWPwVw" name="cbcclass class diagram" repPath="#_oHCJwFdCEeuHCOoWYWPwVw" changeId="7e07f6d8-5eb4-4e57-af52-867d6baefc38">
->>>>>>> master
-        <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
-        <target xmi:type="ecore:EPackage" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#/"/>
-      </ownedRepresentationDescriptors>
-    </ownedViews>
-    <ownedViews xmi:type="viewpoint:DView" uid="_o7XwgBhnEeu74r7X1vovKw">
-      <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']"/>
-    </ownedViews>
-    <ownedViews xmi:type="viewpoint:DView" uid="_o7nBEBhnEeu74r7X1vovKw">
-      <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Archetype']"/>
-    </ownedViews>
-    <ownedViews xmi:type="viewpoint:DView" uid="_pBRkMBhnEeu74r7X1vovKw">
-      <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Generation']"/>
-    </ownedViews>
-  </viewpoint:DAnalysis>
-  <diagram:DSemanticDiagram uid="_rIKYMBhnEeu74r7X1vovKw">
-    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_rIKYMRhnEeu74r7X1vovKw" source="DANNOTATION_CUSTOMIZATION_KEY">
-      <data xmi:type="diagram:ComputedStyleDescriptionRegistry" uid="_rIKYMhhnEeu74r7X1vovKw">
-        <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_tS-C4BhnEeu74r7X1vovKw" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-          <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_tS-C4RhnEeu74r7X1vovKw" showIcon="false" labelExpression="service:render">
-            <labelFormat>bold</labelFormat>
-            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-          </centerLabelStyleDescription>
-          <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_tS-C4hhnEeu74r7X1vovKw" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-          </endLabelStyleDescription>
-        </computedStyleDescriptions>
-        <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_tS_4ERhnEeu74r7X1vovKw" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-          <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_tS_4EhhnEeu74r7X1vovKw" showIcon="false" labelExpression="service:render">
-            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-          </centerLabelStyleDescription>
-          <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_tS_4ExhnEeu74r7X1vovKw" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-          </endLabelStyleDescription>
-        </computedStyleDescriptions>
-        <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_tTeZMBhnEeu74r7X1vovKw" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-          <beginLabelStyleDescription xmi:type="style:BeginLabelStyleDescription" xmi:id="_tTeZMRhnEeu74r7X1vovKw" showIcon="false" labelExpression="service:renderEOpposite">
-            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-          </beginLabelStyleDescription>
-          <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_tTeZMhhnEeu74r7X1vovKw" showIcon="false" labelExpression="service:render">
-            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-          </endLabelStyleDescription>
-        </computedStyleDescriptions>
-        <computedStyleDescriptions xmi:type="style:BundledImageDescription" xmi:id="_V6PmQDlTEeuTsePhuAzSNA" labelExpression="service:render" labelAlignment="LEFT" tooltipExpression="service:renderTooltip" sizeComputationExpression="1">
-          <borderColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-          <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-          <color xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-        </computedStyleDescriptions>
-<<<<<<< HEAD
-        <computedStyleDescriptions xmi:type="style:BundledImageDescription" xmi:id="_NNK0IcksEeurpJGqlvHU8A" labelExpression="service:renderAsNode" labelAlignment="LEFT" tooltipExpression="service:renderTooltip" sizeComputationExpression="1">
-          <borderColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-          <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-          <color xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
-=======
-        <computedStyleDescriptions xmi:type="style:BundledImageDescription" xmi:id="_otNxIARoEe6qzcyNffzqYg" labelExpression="service:render" labelAlignment="LEFT" tooltipExpression="service:renderTooltip" sizeComputationExpression="1">
-          <borderColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-          <labelFormat>bold</labelFormat>
-          <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-          <color xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
->>>>>>> master
-        </computedStyleDescriptions>
-      </data>
-    </ownedAnnotationEntries>
-    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_rIr8oBhnEeu74r7X1vovKw" source="GMF_DIAGRAMS">
-      <data xmi:type="notation:Diagram" xmi:id="_rIr8oRhnEeu74r7X1vovKw" type="Sirius" element="_rIKYMBhnEeu74r7X1vovKw" measurementUnit="Pixel">
-        <children xmi:type="notation:Node" xmi:id="_tTlt8BhnEeu74r7X1vovKw" type="2003" element="_tR6S8BhnEeu74r7X1vovKw">
-          <children xmi:type="notation:Node" xmi:id="_tTm8EBhnEeu74r7X1vovKw" type="5007"/>
-          <children xmi:type="notation:Node" xmi:id="_tToKMBhnEeu74r7X1vovKw" type="7004">
-<<<<<<< HEAD
-            <children xmi:type="notation:Node" xmi:id="_tT2zsBhnEeu74r7X1vovKw" type="3010" element="_tSm2gBhnEeu74r7X1vovKw">
-              <styles xmi:type="notation:FontStyle" xmi:id="_tT2zsRhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_tT2zshhnEeu74r7X1vovKw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_tT3awBhnEeu74r7X1vovKw" type="3010" element="_tSndkBhnEeu74r7X1vovKw">
-              <styles xmi:type="notation:FontStyle" xmi:id="_tT3awRhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_tT3awhhnEeu74r7X1vovKw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_tT3awxhnEeu74r7X1vovKw" type="3010" element="_tSndkhhnEeu74r7X1vovKw">
-              <styles xmi:type="notation:FontStyle" xmi:id="_tT3axBhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_tT3axRhnEeu74r7X1vovKw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_tT4B0BhnEeu74r7X1vovKw" type="3010" element="_tSoEoRhnEeu74r7X1vovKw">
-              <styles xmi:type="notation:FontStyle" xmi:id="_tT4B0RhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_tT4B0hhnEeu74r7X1vovKw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_tT4B1hhnEeu74r7X1vovKw" type="3010" element="_tSorshhnEeu74r7X1vovKw">
-              <styles xmi:type="notation:FontStyle" xmi:id="_tT4B1xhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_tT4B2BhnEeu74r7X1vovKw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_tT4o4BhnEeu74r7X1vovKw" type="3010" element="_tSpSwRhnEeu74r7X1vovKw">
-              <styles xmi:type="notation:FontStyle" xmi:id="_tT4o4RhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_tT4o4hhnEeu74r7X1vovKw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_NNY2kMksEeurpJGqlvHU8A" type="3010" element="_NNHw0MksEeurpJGqlvHU8A">
-=======
-            <children xmi:type="notation:Node" xmi:id="_tT2zsBhnEeu74r7X1vovKw" type="3010" element="_ODGCcwRpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_tT2zsRhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_tT2zshhnEeu74r7X1vovKw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_tT3awBhnEeu74r7X1vovKw" type="3010" element="_ODH3oARpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_tT3awRhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_tT3awhhnEeu74r7X1vovKw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_tT3awxhnEeu74r7X1vovKw" type="3010" element="_ODIesARpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_tT3axBhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_tT3axRhnEeu74r7X1vovKw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_tT4B0BhnEeu74r7X1vovKw" type="3010" element="_ODIesgRpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_tT4B0RhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_tT4B0hhnEeu74r7X1vovKw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_tT4B1hhnEeu74r7X1vovKw" type="3010" element="_ODJFwQRpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_tT4B1xhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_tT4B2BhnEeu74r7X1vovKw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_tT4o4BhnEeu74r7X1vovKw" type="3010" element="_ODJFwwRpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_tT4o4RhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_tT4o4hhnEeu74r7X1vovKw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_ouRhEARoEe6qzcyNffzqYg" type="3010" element="_ODJs0ARpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_ouRhEQRoEe6qzcyNffzqYg" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_ouRhEgRoEe6qzcyNffzqYg"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_NNY2kMksEeurpJGqlvHU8A" type="3010" element="_ODKT4ARpEe6qzcyNffzqYg">
->>>>>>> master
-              <styles xmi:type="notation:FontStyle" xmi:id="_NNY2kcksEeurpJGqlvHU8A" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_NNY2ksksEeurpJGqlvHU8A"/>
-            </children>
-            <styles xmi:type="notation:SortingStyle" xmi:id="_tToKMRhnEeu74r7X1vovKw"/>
-            <styles xmi:type="notation:FilteringStyle" xmi:id="_tToKMhhnEeu74r7X1vovKw"/>
-          </children>
-          <styles xmi:type="notation:ShapeStyle" xmi:id="_tTlt8RhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tTlt8hhnEeu74r7X1vovKw" x="3178" y="257"/>
-        </children>
-        <children xmi:type="notation:Node" xmi:id="_tToKMxhnEeu74r7X1vovKw" type="2003" element="_tR9WQBhnEeu74r7X1vovKw">
-          <children xmi:type="notation:Node" xmi:id="_tToxQBhnEeu74r7X1vovKw" type="5007"/>
-          <children xmi:type="notation:Node" xmi:id="_tToxQRhnEeu74r7X1vovKw" type="7004">
-<<<<<<< HEAD
-            <children xmi:type="notation:Node" xmi:id="_tT4o4xhnEeu74r7X1vovKw" type="3010" element="_tSp50BhnEeu74r7X1vovKw">
-              <styles xmi:type="notation:FontStyle" xmi:id="_tT4o5BhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_tT4o5RhnEeu74r7X1vovKw"/>
-            </children>
-=======
-            <children xmi:type="notation:Node" xmi:id="_tT4o4xhnEeu74r7X1vovKw" type="3010" element="_ODK68QRpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_tT4o5BhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_tT4o5RhnEeu74r7X1vovKw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_oub5IARoEe6qzcyNffzqYg" type="3010" element="_ODLiAQRpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_oub5IQRoEe6qzcyNffzqYg" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_oub5IgRoEe6qzcyNffzqYg"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_oucgMARoEe6qzcyNffzqYg" type="3010" element="_ODMJEARpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_oucgMQRoEe6qzcyNffzqYg" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_oucgMgRoEe6qzcyNffzqYg"/>
-            </children>
->>>>>>> master
-            <styles xmi:type="notation:SortingStyle" xmi:id="_tToxQhhnEeu74r7X1vovKw"/>
-            <styles xmi:type="notation:FilteringStyle" xmi:id="_tToxQxhnEeu74r7X1vovKw"/>
-          </children>
-          <styles xmi:type="notation:ShapeStyle" xmi:id="_tToKNBhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tToKNRhnEeu74r7X1vovKw" x="2150"/>
-        </children>
-        <children xmi:type="notation:Node" xmi:id="_tToxRBhnEeu74r7X1vovKw" type="2003" element="_tR99UBhnEeu74r7X1vovKw">
-          <children xmi:type="notation:Node" xmi:id="_tTpYUBhnEeu74r7X1vovKw" type="5007"/>
-          <children xmi:type="notation:Node" xmi:id="_tTpYURhnEeu74r7X1vovKw" type="7004">
-<<<<<<< HEAD
-            <children xmi:type="notation:Node" xmi:id="_tT5P8BhnEeu74r7X1vovKw" type="3010" element="_tSqg4BhnEeu74r7X1vovKw">
-              <styles xmi:type="notation:FontStyle" xmi:id="_tT5P8RhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_tT5P8hhnEeu74r7X1vovKw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_tT5P8xhnEeu74r7X1vovKw" type="3010" element="_tSrH8BhnEeu74r7X1vovKw">
-              <styles xmi:type="notation:FontStyle" xmi:id="_tT5P9BhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_tT5P9RhnEeu74r7X1vovKw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_tT5P9hhnEeu74r7X1vovKw" type="3010" element="_tSrH8hhnEeu74r7X1vovKw">
-              <styles xmi:type="notation:FontStyle" xmi:id="_tT5P9xhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_tT5P-BhnEeu74r7X1vovKw"/>
-            </children>
-=======
-            <children xmi:type="notation:Node" xmi:id="_tT5P8BhnEeu74r7X1vovKw" type="3010" element="_ODMwIARpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_tT5P8RhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_tT5P8hhnEeu74r7X1vovKw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_tT5P8xhnEeu74r7X1vovKw" type="3010" element="_ODNXMARpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_tT5P9BhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_tT5P9RhnEeu74r7X1vovKw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_tT5P9hhnEeu74r7X1vovKw" type="3010" element="_ODNXMgRpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_tT5P9xhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_tT5P-BhnEeu74r7X1vovKw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_oudHQwRoEe6qzcyNffzqYg" type="3010" element="_ODN-QQRpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_oudHRARoEe6qzcyNffzqYg" fontName="Segoe UI" fontHeight="8" bold="true"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_oudHRQRoEe6qzcyNffzqYg"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_ouduUARoEe6qzcyNffzqYg" type="3010" element="_ODPMYARpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_ouduUQRoEe6qzcyNffzqYg" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_ouduUgRoEe6qzcyNffzqYg"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_ouduUwRoEe6qzcyNffzqYg" type="3010" element="_ODQagARpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_ouduVARoEe6qzcyNffzqYg" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_ouduVQRoEe6qzcyNffzqYg"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_oueVYARoEe6qzcyNffzqYg" type="3010" element="_ODUr8ARpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_oueVYQRoEe6qzcyNffzqYg" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_oueVYgRoEe6qzcyNffzqYg"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_oueVYwRoEe6qzcyNffzqYg" type="3010" element="_ODVTAARpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_oueVZARoEe6qzcyNffzqYg" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_oueVZQRoEe6qzcyNffzqYg"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_oue8cARoEe6qzcyNffzqYg" type="3010" element="_ODV6EARpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_oue8cQRoEe6qzcyNffzqYg" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_oue8cgRoEe6qzcyNffzqYg"/>
-            </children>
->>>>>>> master
-            <styles xmi:type="notation:SortingStyle" xmi:id="_tTpYUhhnEeu74r7X1vovKw"/>
-            <styles xmi:type="notation:FilteringStyle" xmi:id="_tTpYUxhnEeu74r7X1vovKw"/>
-          </children>
-          <styles xmi:type="notation:ShapeStyle" xmi:id="_tToxRRhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tToxRhhnEeu74r7X1vovKw" x="2330" y="160"/>
-        </children>
-        <children xmi:type="notation:Node" xmi:id="_tTpYVBhnEeu74r7X1vovKw" type="2003" element="_tR-kYBhnEeu74r7X1vovKw">
-          <children xmi:type="notation:Node" xmi:id="_tTpYVxhnEeu74r7X1vovKw" type="5007"/>
-          <children xmi:type="notation:Node" xmi:id="_tTpYWBhnEeu74r7X1vovKw" type="7004">
-            <styles xmi:type="notation:SortingStyle" xmi:id="_tTpYWRhnEeu74r7X1vovKw"/>
-            <styles xmi:type="notation:FilteringStyle" xmi:id="_tTpYWhhnEeu74r7X1vovKw"/>
-          </children>
-          <styles xmi:type="notation:ShapeStyle" xmi:id="_tTpYVRhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tTpYVhhnEeu74r7X1vovKw" x="2150" y="342"/>
-        </children>
-        <children xmi:type="notation:Node" xmi:id="_tTp_YBhnEeu74r7X1vovKw" type="2003" element="_tR_LcRhnEeu74r7X1vovKw">
-          <children xmi:type="notation:Node" xmi:id="_tTp_YxhnEeu74r7X1vovKw" type="5007"/>
-          <children xmi:type="notation:Node" xmi:id="_tTp_ZBhnEeu74r7X1vovKw" type="7004">
-            <styles xmi:type="notation:SortingStyle" xmi:id="_tTp_ZRhnEeu74r7X1vovKw"/>
-            <styles xmi:type="notation:FilteringStyle" xmi:id="_tTp_ZhhnEeu74r7X1vovKw"/>
-          </children>
-          <styles xmi:type="notation:ShapeStyle" xmi:id="_tTp_YRhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tTp_YhhnEeu74r7X1vovKw" x="2915" y="320"/>
-        </children>
-        <children xmi:type="notation:Node" xmi:id="_tTp_ZxhnEeu74r7X1vovKw" type="2003" element="_tR_ygBhnEeu74r7X1vovKw">
-          <children xmi:type="notation:Node" xmi:id="_tTqmcBhnEeu74r7X1vovKw" type="5007"/>
-          <children xmi:type="notation:Node" xmi:id="_tTqmcRhnEeu74r7X1vovKw" type="7004">
-<<<<<<< HEAD
-            <children xmi:type="notation:Node" xmi:id="_tT53ABhnEeu74r7X1vovKw" type="3010" element="_tSsWEBhnEeu74r7X1vovKw">
-=======
-            <children xmi:type="notation:Node" xmi:id="_tT53ABhnEeu74r7X1vovKw" type="3010" element="_ODWhIARpEe6qzcyNffzqYg">
->>>>>>> master
-              <styles xmi:type="notation:FontStyle" xmi:id="_tT53ARhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_tT53AhhnEeu74r7X1vovKw"/>
-            </children>
-            <styles xmi:type="notation:SortingStyle" xmi:id="_tTqmchhnEeu74r7X1vovKw"/>
-            <styles xmi:type="notation:FilteringStyle" xmi:id="_tTqmcxhnEeu74r7X1vovKw"/>
-          </children>
-          <styles xmi:type="notation:ShapeStyle" xmi:id="_tTp_aBhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tTp_aRhnEeu74r7X1vovKw" x="2685" y="320"/>
-        </children>
-        <children xmi:type="notation:Node" xmi:id="_tTsboBhnEeu74r7X1vovKw" type="2003" element="_tSCOwBhnEeu74r7X1vovKw">
-          <children xmi:type="notation:Node" xmi:id="_tTsboxhnEeu74r7X1vovKw" type="5007"/>
-          <children xmi:type="notation:Node" xmi:id="_tTsbpBhnEeu74r7X1vovKw" type="7004">
-<<<<<<< HEAD
-            <children xmi:type="notation:Node" xmi:id="_tT53BhhnEeu74r7X1vovKw" type="3010" element="_tSuLQBhnEeu74r7X1vovKw">
-=======
-            <children xmi:type="notation:Node" xmi:id="_tT53BhhnEeu74r7X1vovKw" type="3010" element="_ODXIMARpEe6qzcyNffzqYg">
->>>>>>> master
-              <styles xmi:type="notation:FontStyle" xmi:id="_tT53BxhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_tT53CBhnEeu74r7X1vovKw"/>
-            </children>
-            <styles xmi:type="notation:SortingStyle" xmi:id="_tTsbpRhnEeu74r7X1vovKw"/>
-            <styles xmi:type="notation:FilteringStyle" xmi:id="_tTsbphhnEeu74r7X1vovKw"/>
-          </children>
-          <styles xmi:type="notation:ShapeStyle" xmi:id="_tTsboRhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tTsbohhnEeu74r7X1vovKw" x="1615" y="160"/>
-        </children>
-        <children xmi:type="notation:Node" xmi:id="_tTsbpxhnEeu74r7X1vovKw" type="2003" element="_tSC10RhnEeu74r7X1vovKw">
-          <children xmi:type="notation:Node" xmi:id="_tTtCshhnEeu74r7X1vovKw" type="5007"/>
-          <children xmi:type="notation:Node" xmi:id="_tTtCsxhnEeu74r7X1vovKw" type="7004">
-            <styles xmi:type="notation:SortingStyle" xmi:id="_tTtCtBhnEeu74r7X1vovKw"/>
-            <styles xmi:type="notation:FilteringStyle" xmi:id="_tTtCtRhnEeu74r7X1vovKw"/>
-          </children>
-          <styles xmi:type="notation:ShapeStyle" xmi:id="_tTtCsBhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tTtCsRhnEeu74r7X1vovKw" x="1935" y="320"/>
-        </children>
-        <children xmi:type="notation:Node" xmi:id="_tTuQ1BhnEeu74r7X1vovKw" type="2003" element="_tSF5IBhnEeu74r7X1vovKw">
-          <children xmi:type="notation:Node" xmi:id="_tTuQ1xhnEeu74r7X1vovKw" type="5007"/>
-          <children xmi:type="notation:Node" xmi:id="_tTuQ2BhnEeu74r7X1vovKw" type="7004">
-<<<<<<< HEAD
-            <children xmi:type="notation:Node" xmi:id="_tT8TQxhnEeu74r7X1vovKw" type="3010" element="_tSwngBhnEeu74r7X1vovKw">
-              <styles xmi:type="notation:FontStyle" xmi:id="_tT8TRBhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_tT8TRRhnEeu74r7X1vovKw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_tT86UBhnEeu74r7X1vovKw" type="3010" element="_tSwnghhnEeu74r7X1vovKw">
-              <styles xmi:type="notation:FontStyle" xmi:id="_tT86URhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_tT86UhhnEeu74r7X1vovKw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_tT86UxhnEeu74r7X1vovKw" type="3010" element="_tSxOkRhnEeu74r7X1vovKw">
-=======
-            <children xmi:type="notation:Node" xmi:id="_tT8TQxhnEeu74r7X1vovKw" type="3010" element="_ODXvQQRpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_tT8TRBhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_tT8TRRhnEeu74r7X1vovKw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_tT86UBhnEeu74r7X1vovKw" type="3010" element="_ODYWUQRpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_tT86URhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_tT86UhhnEeu74r7X1vovKw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_tT86UxhnEeu74r7X1vovKw" type="3010" element="_ODY9YQRpEe6qzcyNffzqYg">
->>>>>>> master
-              <styles xmi:type="notation:FontStyle" xmi:id="_tT86VBhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_tT86VRhnEeu74r7X1vovKw"/>
-            </children>
-            <styles xmi:type="notation:SortingStyle" xmi:id="_tTuQ2RhnEeu74r7X1vovKw"/>
-            <styles xmi:type="notation:FilteringStyle" xmi:id="_tTuQ2hhnEeu74r7X1vovKw"/>
-          </children>
-          <styles xmi:type="notation:ShapeStyle" xmi:id="_tTuQ1RhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tTuQ1hhnEeu74r7X1vovKw" x="1035" y="320"/>
-        </children>
-        <children xmi:type="notation:Node" xmi:id="_tTu34BhnEeu74r7X1vovKw" type="2003" element="_tSGgMBhnEeu74r7X1vovKw">
-          <children xmi:type="notation:Node" xmi:id="_tTu34xhnEeu74r7X1vovKw" type="5007"/>
-          <children xmi:type="notation:Node" xmi:id="_tTu35BhnEeu74r7X1vovKw" type="7004">
-<<<<<<< HEAD
-            <children xmi:type="notation:Node" xmi:id="_NNZdoMksEeurpJGqlvHU8A" type="3010" element="_NNK0IMksEeurpJGqlvHU8A">
-              <styles xmi:type="notation:FontStyle" xmi:id="_NNZdocksEeurpJGqlvHU8A" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_NNZdosksEeurpJGqlvHU8A"/>
-            </children>
-=======
-            <children xmi:type="notation:Node" xmi:id="_NNZdoMksEeurpJGqlvHU8A" type="3010" element="_ODZkcARpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_NNZdocksEeurpJGqlvHU8A" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_NNZdosksEeurpJGqlvHU8A"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_oufjgARoEe6qzcyNffzqYg" type="3010" element="_ODaLgARpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_oufjgQRoEe6qzcyNffzqYg" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_oufjggRoEe6qzcyNffzqYg"/>
-            </children>
->>>>>>> master
-            <styles xmi:type="notation:SortingStyle" xmi:id="_tTu35RhnEeu74r7X1vovKw"/>
-            <styles xmi:type="notation:FilteringStyle" xmi:id="_tTu35hhnEeu74r7X1vovKw"/>
-          </children>
-          <styles xmi:type="notation:ShapeStyle" xmi:id="_tTu34RhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tTu34hhnEeu74r7X1vovKw" x="3960" y="320"/>
-        </children>
-        <children xmi:type="notation:Node" xmi:id="_tTu35xhnEeu74r7X1vovKw" type="2003" element="_tSHuUBhnEeu74r7X1vovKw">
-          <children xmi:type="notation:Node" xmi:id="_tTve8BhnEeu74r7X1vovKw" type="5007"/>
-          <children xmi:type="notation:Node" xmi:id="_tTve8RhnEeu74r7X1vovKw" type="7004">
-<<<<<<< HEAD
-            <children xmi:type="notation:Node" xmi:id="_tT9hYBhnEeu74r7X1vovKw" type="3010" element="_tSx1oBhnEeu74r7X1vovKw">
-              <styles xmi:type="notation:FontStyle" xmi:id="_tT9hYRhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_tT9hYhhnEeu74r7X1vovKw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_tT9hYxhnEeu74r7X1vovKw" type="3010" element="_tSycsBhnEeu74r7X1vovKw">
-              <styles xmi:type="notation:FontStyle" xmi:id="_tT9hZBhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_tT9hZRhnEeu74r7X1vovKw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_tT-IcBhnEeu74r7X1vovKw" type="3010" element="_tSycshhnEeu74r7X1vovKw">
-=======
-            <children xmi:type="notation:Node" xmi:id="_tT9hYBhnEeu74r7X1vovKw" type="3010" element="_ODcAsARpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_tT9hYRhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_tT9hYhhnEeu74r7X1vovKw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_tT9hYxhnEeu74r7X1vovKw" type="3010" element="_ODcnwQRpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_tT9hZBhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_tT9hZRhnEeu74r7X1vovKw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_oufjgwRoEe6qzcyNffzqYg" type="3010" element="_ODdO0QRpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_oufjhARoEe6qzcyNffzqYg" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_oufjhQRoEe6qzcyNffzqYg"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_ougxoARoEe6qzcyNffzqYg" type="3010" element="_ODd14ARpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_ougxoQRoEe6qzcyNffzqYg" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_ougxogRoEe6qzcyNffzqYg"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_tT-IcBhnEeu74r7X1vovKw" type="3010" element="_ODd14gRpEe6qzcyNffzqYg">
->>>>>>> master
-              <styles xmi:type="notation:FontStyle" xmi:id="_tT-IcRhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_tT-IchhnEeu74r7X1vovKw"/>
-            </children>
-            <styles xmi:type="notation:SortingStyle" xmi:id="_tTve8hhnEeu74r7X1vovKw"/>
-            <styles xmi:type="notation:FilteringStyle" xmi:id="_tTve8xhnEeu74r7X1vovKw"/>
-          </children>
-          <styles xmi:type="notation:ShapeStyle" xmi:id="_tTu36BhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tTu36RhnEeu74r7X1vovKw" x="3965" y="160"/>
-        </children>
-        <children xmi:type="notation:Node" xmi:id="_tTwGABhnEeu74r7X1vovKw" type="2003" element="_tSI8cBhnEeu74r7X1vovKw">
-          <children xmi:type="notation:Node" xmi:id="_tTwtEBhnEeu74r7X1vovKw" type="5007"/>
-          <children xmi:type="notation:Node" xmi:id="_tTxUIBhnEeu74r7X1vovKw" type="7004">
-            <styles xmi:type="notation:SortingStyle" xmi:id="_tTxUIRhnEeu74r7X1vovKw"/>
-            <styles xmi:type="notation:FilteringStyle" xmi:id="_tTxUIhhnEeu74r7X1vovKw"/>
-          </children>
-          <styles xmi:type="notation:ShapeStyle" xmi:id="_tTwGARhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tTwGAhhnEeu74r7X1vovKw" x="1795" y="160"/>
-        </children>
-        <children xmi:type="notation:Node" xmi:id="_tTxUIxhnEeu74r7X1vovKw" type="2003" element="_tSKKkBhnEeu74r7X1vovKw">
-          <children xmi:type="notation:Node" xmi:id="_tTx7MBhnEeu74r7X1vovKw" type="5007"/>
-          <children xmi:type="notation:Node" xmi:id="_tTx7MRhnEeu74r7X1vovKw" type="7004">
-            <styles xmi:type="notation:SortingStyle" xmi:id="_tTx7MhhnEeu74r7X1vovKw"/>
-            <styles xmi:type="notation:FilteringStyle" xmi:id="_tTx7MxhnEeu74r7X1vovKw"/>
-          </children>
-          <styles xmi:type="notation:ShapeStyle" xmi:id="_tTxUJBhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tTxUJRhnEeu74r7X1vovKw" x="3780" y="320"/>
-        </children>
-        <children xmi:type="notation:Node" xmi:id="_tTx7NBhnEeu74r7X1vovKw" type="2003" element="_tSKxoBhnEeu74r7X1vovKw">
-          <children xmi:type="notation:Node" xmi:id="_tTyiQBhnEeu74r7X1vovKw" type="5007"/>
-          <children xmi:type="notation:Node" xmi:id="_tTyiQRhnEeu74r7X1vovKw" type="7004">
-<<<<<<< HEAD
-            <children xmi:type="notation:Node" xmi:id="_tT-IcxhnEeu74r7X1vovKw" type="3010" element="_tSzq0BhnEeu74r7X1vovKw">
-              <styles xmi:type="notation:FontStyle" xmi:id="_tT-IdBhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_tT-IdRhnEeu74r7X1vovKw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_tT-IdhhnEeu74r7X1vovKw" type="3010" element="_tS0R4BhnEeu74r7X1vovKw">
-              <styles xmi:type="notation:FontStyle" xmi:id="_tT-IdxhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_tT-IeBhnEeu74r7X1vovKw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_tT-vgBhnEeu74r7X1vovKw" type="3010" element="_tS0R4hhnEeu74r7X1vovKw">
-=======
-            <children xmi:type="notation:Node" xmi:id="_tT-IcxhnEeu74r7X1vovKw" type="3010" element="_ODg5MARpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_tT-IdBhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_tT-IdRhnEeu74r7X1vovKw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_tT-IdhhnEeu74r7X1vovKw" type="3010" element="_ODhgQQRpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_tT-IdxhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_tT-IeBhnEeu74r7X1vovKw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_tT-vgBhnEeu74r7X1vovKw" type="3010" element="_ODiHUQRpEe6qzcyNffzqYg">
->>>>>>> master
-              <styles xmi:type="notation:FontStyle" xmi:id="_tT-vgRhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_tT-vghhnEeu74r7X1vovKw"/>
-            </children>
-            <styles xmi:type="notation:SortingStyle" xmi:id="_tTyiQhhnEeu74r7X1vovKw"/>
-            <styles xmi:type="notation:FilteringStyle" xmi:id="_tTyiQxhnEeu74r7X1vovKw"/>
-          </children>
-          <styles xmi:type="notation:ShapeStyle" xmi:id="_tTx7NRhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tTx7NhhnEeu74r7X1vovKw" x="3780" y="160"/>
-        </children>
-        <children xmi:type="notation:Node" xmi:id="_tTyiRBhnEeu74r7X1vovKw" type="2003" element="_tSL_wBhnEeu74r7X1vovKw">
-          <children xmi:type="notation:Node" xmi:id="_tTyiRxhnEeu74r7X1vovKw" type="5007"/>
-          <children xmi:type="notation:Node" xmi:id="_tTzJUBhnEeu74r7X1vovKw" type="7004">
-            <styles xmi:type="notation:SortingStyle" xmi:id="_tTzJURhnEeu74r7X1vovKw"/>
-            <styles xmi:type="notation:FilteringStyle" xmi:id="_tTzJUhhnEeu74r7X1vovKw"/>
-          </children>
-          <styles xmi:type="notation:ShapeStyle" xmi:id="_tTyiRRhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tTyiRhhnEeu74r7X1vovKw" x="1290" y="525"/>
-        </children>
-        <children xmi:type="notation:Node" xmi:id="_tTzJUxhnEeu74r7X1vovKw" type="2003" element="_tSNN4BhnEeu74r7X1vovKw">
-          <children xmi:type="notation:Node" xmi:id="_tTzJVhhnEeu74r7X1vovKw" type="5007"/>
-          <children xmi:type="notation:Node" xmi:id="_tTzJVxhnEeu74r7X1vovKw" type="7004">
-            <styles xmi:type="notation:SortingStyle" xmi:id="_tTzJWBhnEeu74r7X1vovKw"/>
-            <styles xmi:type="notation:FilteringStyle" xmi:id="_tTzJWRhnEeu74r7X1vovKw"/>
-          </children>
-          <styles xmi:type="notation:ShapeStyle" xmi:id="_tTzJVBhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tTzJVRhnEeu74r7X1vovKw" x="2295" y="320"/>
-        </children>
-        <children xmi:type="notation:Node" xmi:id="_tTzwZxhnEeu74r7X1vovKw" type="2003" element="_tSOcABhnEeu74r7X1vovKw">
-          <children xmi:type="notation:Node" xmi:id="_tT0XcBhnEeu74r7X1vovKw" type="5007"/>
-          <children xmi:type="notation:Node" xmi:id="_tT0XcRhnEeu74r7X1vovKw" type="7004">
-<<<<<<< HEAD
-            <children xmi:type="notation:Node" xmi:id="_tT-vgxhnEeu74r7X1vovKw" type="3010" element="_tS38QBhnEeu74r7X1vovKw">
-              <styles xmi:type="notation:FontStyle" xmi:id="_tT-vhBhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_tT-vhRhnEeu74r7X1vovKw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_tT-vhhhnEeu74r7X1vovKw" type="3010" element="_tS4jUBhnEeu74r7X1vovKw">
-              <styles xmi:type="notation:FontStyle" xmi:id="_tT-vhxhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_tT-viBhnEeu74r7X1vovKw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_tT_WkBhnEeu74r7X1vovKw" type="3010" element="_tS4jUhhnEeu74r7X1vovKw">
-              <styles xmi:type="notation:FontStyle" xmi:id="_tT_WkRhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_tT_WkhhnEeu74r7X1vovKw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_tT_WkxhnEeu74r7X1vovKw" type="3010" element="_tS5KYBhnEeu74r7X1vovKw">
-              <styles xmi:type="notation:FontStyle" xmi:id="_tT_WlBhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_tT_WlRhnEeu74r7X1vovKw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_tT_WlhhnEeu74r7X1vovKw" type="3010" element="_tS5KYhhnEeu74r7X1vovKw">
-              <styles xmi:type="notation:FontStyle" xmi:id="_tT_WlxhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_tT_WmBhnEeu74r7X1vovKw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_tT_WmRhnEeu74r7X1vovKw" type="3010" element="_tS5xcRhnEeu74r7X1vovKw">
-=======
-            <children xmi:type="notation:Node" xmi:id="_tT-vgxhnEeu74r7X1vovKw" type="3010" element="_ODnm4ARpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_tT-vhBhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_tT-vhRhnEeu74r7X1vovKw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_tT-vhhhnEeu74r7X1vovKw" type="3010" element="_ODoN8ARpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_tT-vhxhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_tT-viBhnEeu74r7X1vovKw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_tT_WkBhnEeu74r7X1vovKw" type="3010" element="_ODoN8gRpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_tT_WkRhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_tT_WkhhnEeu74r7X1vovKw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_tT_WkxhnEeu74r7X1vovKw" type="3010" element="_ODoN9ARpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_tT_WlBhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_tT_WlRhnEeu74r7X1vovKw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_tT_WlhhnEeu74r7X1vovKw" type="3010" element="_ODo1AQRpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_tT_WlxhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_tT_WmBhnEeu74r7X1vovKw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_tT_WmRhnEeu74r7X1vovKw" type="3010" element="_ODo1AwRpEe6qzcyNffzqYg">
->>>>>>> master
-              <styles xmi:type="notation:FontStyle" xmi:id="_tT_WmhhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_tT_WmxhnEeu74r7X1vovKw"/>
-            </children>
-            <styles xmi:type="notation:SortingStyle" xmi:id="_tT0XchhnEeu74r7X1vovKw"/>
-            <styles xmi:type="notation:FilteringStyle" xmi:id="_tT0XcxhnEeu74r7X1vovKw"/>
-          </children>
-          <styles xmi:type="notation:ShapeStyle" xmi:id="_tTzwaBhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tTzwaRhnEeu74r7X1vovKw"/>
-        </children>
-        <children xmi:type="notation:Node" xmi:id="_tT0XdBhnEeu74r7X1vovKw" type="2003" element="_tSPDEBhnEeu74r7X1vovKw">
-          <children xmi:type="notation:Node" xmi:id="_tT0XdxhnEeu74r7X1vovKw" type="5007"/>
-          <children xmi:type="notation:Node" xmi:id="_tT0XeBhnEeu74r7X1vovKw" type="7004">
-<<<<<<< HEAD
-            <children xmi:type="notation:Node" xmi:id="_tT_9oBhnEeu74r7X1vovKw" type="3010" element="_tS6YgBhnEeu74r7X1vovKw">
-              <styles xmi:type="notation:FontStyle" xmi:id="_tT_9oRhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_tT_9ohhnEeu74r7X1vovKw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_tT_9oxhnEeu74r7X1vovKw" type="3010" element="_tS6YghhnEeu74r7X1vovKw">
-              <styles xmi:type="notation:FontStyle" xmi:id="_tT_9pBhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_tT_9pRhnEeu74r7X1vovKw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_tT_9phhnEeu74r7X1vovKw" type="3010" element="_tS6_kBhnEeu74r7X1vovKw">
-=======
-            <children xmi:type="notation:Node" xmi:id="_tT_9oBhnEeu74r7X1vovKw" type="3010" element="_ODpcEARpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_tT_9oRhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_tT_9ohhnEeu74r7X1vovKw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_tT_9oxhnEeu74r7X1vovKw" type="3010" element="_ODpcEgRpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_tT_9pBhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_tT_9pRhnEeu74r7X1vovKw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_tT_9phhnEeu74r7X1vovKw" type="3010" element="_ODqqMARpEe6qzcyNffzqYg">
->>>>>>> master
-              <styles xmi:type="notation:FontStyle" xmi:id="_tT_9pxhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_tT_9qBhnEeu74r7X1vovKw"/>
-            </children>
-            <styles xmi:type="notation:SortingStyle" xmi:id="_tT0XeRhnEeu74r7X1vovKw"/>
-            <styles xmi:type="notation:FilteringStyle" xmi:id="_tT0XehhnEeu74r7X1vovKw"/>
-          </children>
-          <styles xmi:type="notation:ShapeStyle" xmi:id="_tT0XdRhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tT0XdhhnEeu74r7X1vovKw" x="180"/>
-        </children>
-<<<<<<< HEAD
-        <children xmi:type="notation:Node" xmi:id="_tT0-hxhnEeu74r7X1vovKw" type="2003" element="_tSQ4QBhnEeu74r7X1vovKw">
-          <children xmi:type="notation:Node" xmi:id="_tT1lkBhnEeu74r7X1vovKw" type="5007"/>
-          <children xmi:type="notation:Node" xmi:id="_tT1lkRhnEeu74r7X1vovKw" type="7004">
-            <children xmi:type="notation:Node" xmi:id="_tUAksxhnEeu74r7X1vovKw" type="3010" element="_tS2HEBhnEeu74r7X1vovKw">
-              <styles xmi:type="notation:FontStyle" xmi:id="_tUAktBhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_tUAktRhnEeu74r7X1vovKw"/>
-            </children>
-            <styles xmi:type="notation:SortingStyle" xmi:id="_tT1lkhhnEeu74r7X1vovKw"/>
-            <styles xmi:type="notation:FilteringStyle" xmi:id="_tT1lkxhnEeu74r7X1vovKw"/>
-          </children>
-          <styles xmi:type="notation:ShapeStyle" xmi:id="_tT0-iBhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tT0-iRhnEeu74r7X1vovKw" x="605" y="320"/>
-        </children>
-        <children xmi:type="notation:Node" xmi:id="_tT1llBhnEeu74r7X1vovKw" type="2003" element="_tSSGYBhnEeu74r7X1vovKw">
-          <children xmi:type="notation:Node" xmi:id="_tT1llxhnEeu74r7X1vovKw" type="5007"/>
-          <children xmi:type="notation:Node" xmi:id="_tT1lmBhnEeu74r7X1vovKw" type="7004">
-            <children xmi:type="notation:Node" xmi:id="_tUAkthhnEeu74r7X1vovKw" type="3010" element="_tS2uIBhnEeu74r7X1vovKw">
-              <styles xmi:type="notation:FontStyle" xmi:id="_tUAktxhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_tUAkuBhnEeu74r7X1vovKw"/>
-            </children>
-            <styles xmi:type="notation:SortingStyle" xmi:id="_tT1lmRhnEeu74r7X1vovKw"/>
-            <styles xmi:type="notation:FilteringStyle" xmi:id="_tT1lmhhnEeu74r7X1vovKw"/>
-          </children>
-          <styles xmi:type="notation:ShapeStyle" xmi:id="_tT1llRhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tT1llhhnEeu74r7X1vovKw" x="830" y="320"/>
-        </children>
-        <styles xmi:type="notation:DiagramStyle" xmi:id="_rIr8ohhnEeu74r7X1vovKw"/>
-        <edges xmi:type="notation:Edge" xmi:id="_tUDoABhnEeu74r7X1vovKw" type="4001" element="_tS80wBhnEeu74r7X1vovKw" source="_tTlt8BhnEeu74r7X1vovKw" target="_tToxRBhnEeu74r7X1vovKw">
-=======
-        <children xmi:type="notation:Node" xmi:id="_8PtgYARoEe6qzcyNffzqYg" type="2003" element="_8Npq4ARoEe6qzcyNffzqYg">
-          <children xmi:type="notation:Node" xmi:id="_8PuugARoEe6qzcyNffzqYg" type="5007"/>
-          <children xmi:type="notation:Node" xmi:id="_8PvVkARoEe6qzcyNffzqYg" type="7004">
-            <children xmi:type="notation:Node" xmi:id="_8P0OEARoEe6qzcyNffzqYg" type="3010" element="_ODiuYARpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_8P0OEQRoEe6qzcyNffzqYg" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_8P0OEgRoEe6qzcyNffzqYg"/>
-            </children>
-            <styles xmi:type="notation:SortingStyle" xmi:id="_8PvVkQRoEe6qzcyNffzqYg"/>
-            <styles xmi:type="notation:FilteringStyle" xmi:id="_8PvVkgRoEe6qzcyNffzqYg"/>
-          </children>
-          <styles xmi:type="notation:ShapeStyle" xmi:id="_8PtgYQRoEe6qzcyNffzqYg" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8PtgYgRoEe6qzcyNffzqYg" x="420" y="27"/>
-        </children>
-        <children xmi:type="notation:Node" xmi:id="_8PwjsARoEe6qzcyNffzqYg" type="2003" element="_8NrgEARoEe6qzcyNffzqYg">
-          <children xmi:type="notation:Node" xmi:id="_8PwjswRoEe6qzcyNffzqYg" type="5007"/>
-          <children xmi:type="notation:Node" xmi:id="_8PxKwARoEe6qzcyNffzqYg" type="7004">
-            <children xmi:type="notation:Node" xmi:id="_8P0OEwRoEe6qzcyNffzqYg" type="3010" element="_ODjVcQRpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_8P0OFARoEe6qzcyNffzqYg" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_8P0OFQRoEe6qzcyNffzqYg"/>
-            </children>
-            <styles xmi:type="notation:SortingStyle" xmi:id="_8PxKwQRoEe6qzcyNffzqYg"/>
-            <styles xmi:type="notation:FilteringStyle" xmi:id="_8PxKwgRoEe6qzcyNffzqYg"/>
-          </children>
-          <styles xmi:type="notation:ShapeStyle" xmi:id="_8PwjsQRoEe6qzcyNffzqYg" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8PwjsgRoEe6qzcyNffzqYg" x="410" y="190"/>
-        </children>
-        <children xmi:type="notation:Node" xmi:id="_8PxKwwRoEe6qzcyNffzqYg" type="2003" element="_8NsuMQRoEe6qzcyNffzqYg">
-          <children xmi:type="notation:Node" xmi:id="_8PxKxgRoEe6qzcyNffzqYg" type="5007"/>
-          <children xmi:type="notation:Node" xmi:id="_8Pxx0ARoEe6qzcyNffzqYg" type="7004">
-            <children xmi:type="notation:Node" xmi:id="_8P01IARoEe6qzcyNffzqYg" type="3010" element="_ODj8gQRpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_8P01IQRoEe6qzcyNffzqYg" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_8P01IgRoEe6qzcyNffzqYg"/>
-            </children>
-            <styles xmi:type="notation:SortingStyle" xmi:id="_8Pxx0QRoEe6qzcyNffzqYg"/>
-            <styles xmi:type="notation:FilteringStyle" xmi:id="_8Pxx0gRoEe6qzcyNffzqYg"/>
-          </children>
-          <styles xmi:type="notation:ShapeStyle" xmi:id="_8PxKxARoEe6qzcyNffzqYg" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8PxKxQRoEe6qzcyNffzqYg" x="615" y="198"/>
-        </children>
-        <children xmi:type="notation:Node" xmi:id="_8Pxx0wRoEe6qzcyNffzqYg" type="2003" element="_8Nt8UARoEe6qzcyNffzqYg">
-          <children xmi:type="notation:Node" xmi:id="_8Pxx1gRoEe6qzcyNffzqYg" type="5007"/>
-          <children xmi:type="notation:Node" xmi:id="_8PyY4ARoEe6qzcyNffzqYg" type="7004">
-            <children xmi:type="notation:Node" xmi:id="_8P01IwRoEe6qzcyNffzqYg" type="3010" element="_ODlKoARpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_8P01JARoEe6qzcyNffzqYg" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_8P01JQRoEe6qzcyNffzqYg"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_8P1cMARoEe6qzcyNffzqYg" type="3010" element="_ODmYwARpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_8P1cMQRoEe6qzcyNffzqYg" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_8P1cMgRoEe6qzcyNffzqYg"/>
-            </children>
-            <styles xmi:type="notation:SortingStyle" xmi:id="_8PyY4QRoEe6qzcyNffzqYg"/>
-            <styles xmi:type="notation:FilteringStyle" xmi:id="_8PyY4gRoEe6qzcyNffzqYg"/>
-          </children>
-          <styles xmi:type="notation:ShapeStyle" xmi:id="_8Pxx1ARoEe6qzcyNffzqYg" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8Pxx1QRoEe6qzcyNffzqYg" x="600" y="27"/>
-        </children>
-        <styles xmi:type="notation:DiagramStyle" xmi:id="_rIr8ohhnEeu74r7X1vovKw"/>
-        <edges xmi:type="notation:Edge" xmi:id="_tUDoABhnEeu74r7X1vovKw" type="4001" element="_ODsfYARpEe6qzcyNffzqYg" source="_tTlt8BhnEeu74r7X1vovKw" target="_tToxRBhnEeu74r7X1vovKw">
->>>>>>> master
-          <children xmi:type="notation:Node" xmi:id="_tUFdMBhnEeu74r7X1vovKw" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUFdMRhnEeu74r7X1vovKw" y="-10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_tUGEQBhnEeu74r7X1vovKw" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUGEQRhnEeu74r7X1vovKw" x="63" y="10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_tUGrUBhnEeu74r7X1vovKw" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUGrURhnEeu74r7X1vovKw" y="10"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_tUDoARhnEeu74r7X1vovKw" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_tUDoAhhnEeu74r7X1vovKw" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tUDoAxhnEeu74r7X1vovKw" points="[-275, -61, 746, 88]$[-629, -61, 392, 88]$[-629, -127, 392, 22]$[-919, -127, 102, 22]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUK8wBhnEeu74r7X1vovKw" id="(0.5,0.5)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUK8wRhnEeu74r7X1vovKw" id="(0.5,0.5)"/>
-        </edges>
-<<<<<<< HEAD
-        <edges xmi:type="notation:Edge" xmi:id="_tULj0BhnEeu74r7X1vovKw" type="4001" element="_tS-p8BhnEeu74r7X1vovKw" source="_tTlt8BhnEeu74r7X1vovKw" target="_tToKMxhnEeu74r7X1vovKw">
-=======
-        <edges xmi:type="notation:Edge" xmi:id="_tULj0BhnEeu74r7X1vovKw" type="4001" element="_ODttgwRpEe6qzcyNffzqYg" source="_tTlt8BhnEeu74r7X1vovKw" target="_tToKMxhnEeu74r7X1vovKw">
->>>>>>> master
-          <children xmi:type="notation:Node" xmi:id="_tULj1BhnEeu74r7X1vovKw" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tULj1RhnEeu74r7X1vovKw" x="4" y="-10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_tULj1hhnEeu74r7X1vovKw" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tULj1xhnEeu74r7X1vovKw" x="6" y="10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_tULj2BhnEeu74r7X1vovKw" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tULj2RhnEeu74r7X1vovKw" x="1" y="10"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_tULj0RhnEeu74r7X1vovKw" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_tULj0hhnEeu74r7X1vovKw" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tULj0xhnEeu74r7X1vovKw" points="[-275, -80, 964, 229]$[-455, -80, 784, 229]$[-455, -300, 784, 9]$[-1175, -300, 64, 9]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUMK4BhnEeu74r7X1vovKw" id="(0.5,0.5)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUMK4RhnEeu74r7X1vovKw" id="(0.5,0.5)"/>
-        </edges>
-<<<<<<< HEAD
-        <edges xmi:type="notation:Edge" xmi:id="_tUMK4hhnEeu74r7X1vovKw" type="4001" element="_tS_RABhnEeu74r7X1vovKw" source="_tTlt8BhnEeu74r7X1vovKw" target="_tToKMxhnEeu74r7X1vovKw">
-=======
-        <edges xmi:type="notation:Edge" xmi:id="_tUMK4hhnEeu74r7X1vovKw" type="4001" element="_ODu7oARpEe6qzcyNffzqYg" source="_tTlt8BhnEeu74r7X1vovKw" target="_tToKMxhnEeu74r7X1vovKw">
->>>>>>> master
-          <children xmi:type="notation:Node" xmi:id="_tUMK5hhnEeu74r7X1vovKw" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUMK5xhnEeu74r7X1vovKw" y="-10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_tUMK6BhnEeu74r7X1vovKw" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUMK6RhnEeu74r7X1vovKw" x="-63" y="10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_tUMK6hhnEeu74r7X1vovKw" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUMK6xhnEeu74r7X1vovKw" y="10"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_tUMK4xhnEeu74r7X1vovKw" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_tUMK5BhnEeu74r7X1vovKw" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tUMK5RhnEeu74r7X1vovKw" points="[-200, -101, 1039, 208]$[-200, -301, 1039, 8]$[-1175, -301, 64, 8]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUMK7BhnEeu74r7X1vovKw" id="(0.5,0.5)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUMK7RhnEeu74r7X1vovKw" id="(0.5,0.5)"/>
-        </edges>
-<<<<<<< HEAD
-        <edges xmi:type="notation:Edge" xmi:id="_tUMx8BhnEeu74r7X1vovKw" type="4001" element="_tS_4EBhnEeu74r7X1vovKw" source="_tToxRBhnEeu74r7X1vovKw" target="_tToKMxhnEeu74r7X1vovKw">
-=======
-        <edges xmi:type="notation:Edge" xmi:id="_tUMx8BhnEeu74r7X1vovKw" type="4001" element="_ODzNFgRpEe6qzcyNffzqYg" source="_tToxRBhnEeu74r7X1vovKw" target="_tToKMxhnEeu74r7X1vovKw">
->>>>>>> master
-          <children xmi:type="notation:Node" xmi:id="_tUMx9BhnEeu74r7X1vovKw" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUMx9RhnEeu74r7X1vovKw" y="10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_tUMx9hhnEeu74r7X1vovKw" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUMx9xhnEeu74r7X1vovKw" x="-6" y="10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_tUMx-BhnEeu74r7X1vovKw" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUMx-RhnEeu74r7X1vovKw" x="-69" y="10"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_tUMx8RhnEeu74r7X1vovKw" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_tUMx8hhnEeu74r7X1vovKw" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tUMx8xhnEeu74r7X1vovKw" points="[-89, -49, 129, 111]$[-89, -100, 129, 60]$[-217, -100, 1, 60]$[-217, -111, 1, 49]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUMx-hhnEeu74r7X1vovKw" id="(0.5,0.5)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUMx-xhnEeu74r7X1vovKw" id="(0.5,0.5)"/>
-        </edges>
-<<<<<<< HEAD
-        <edges xmi:type="notation:Edge" xmi:id="_tUMx_BhnEeu74r7X1vovKw" type="4001" element="_tTAfIBhnEeu74r7X1vovKw" source="_tToxRBhnEeu74r7X1vovKw" target="_tToKMxhnEeu74r7X1vovKw">
-=======
-        <edges xmi:type="notation:Edge" xmi:id="_tUMx_BhnEeu74r7X1vovKw" type="4001" element="_ODz0JgRpEe6qzcyNffzqYg" source="_tToxRBhnEeu74r7X1vovKw" target="_tToKMxhnEeu74r7X1vovKw">
->>>>>>> master
-          <children xmi:type="notation:Node" xmi:id="_tUNZABhnEeu74r7X1vovKw" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUNZARhnEeu74r7X1vovKw" x="71" y="-48"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_tUNZAhhnEeu74r7X1vovKw" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUNZAxhnEeu74r7X1vovKw" y="10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_tUNZBBhnEeu74r7X1vovKw" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUNZBRhnEeu74r7X1vovKw" y="10"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_tUMx_RhnEeu74r7X1vovKw" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_tUMx_hhnEeu74r7X1vovKw" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tUMx_xhnEeu74r7X1vovKw" points="[0, -50, 202, 110]$[-202, -110, 0, 50]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUNZBhhnEeu74r7X1vovKw" id="(0.5,0.5)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUNZBxhnEeu74r7X1vovKw" id="(0.5,0.5)"/>
-        </edges>
-<<<<<<< HEAD
-        <edges xmi:type="notation:Edge" xmi:id="_tUNZCBhnEeu74r7X1vovKw" type="4001" element="_tTBGMBhnEeu74r7X1vovKw" source="_tTp_YBhnEeu74r7X1vovKw" target="_tToxRBhnEeu74r7X1vovKw">
-=======
-        <edges xmi:type="notation:Edge" xmi:id="_tUNZCBhnEeu74r7X1vovKw" type="4001" element="_OD0bNgRpEe6qzcyNffzqYg" source="_tTp_YBhnEeu74r7X1vovKw" target="_tToxRBhnEeu74r7X1vovKw">
->>>>>>> master
-          <children xmi:type="notation:Node" xmi:id="_tUOAEBhnEeu74r7X1vovKw" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUOAERhnEeu74r7X1vovKw" y="-10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_tUOAEhhnEeu74r7X1vovKw" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUOAExhnEeu74r7X1vovKw" y="10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_tUOAFBhnEeu74r7X1vovKw" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUOAFRhnEeu74r7X1vovKw" y="10"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_tUNZCRhnEeu74r7X1vovKw" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_tUNZChhnEeu74r7X1vovKw" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tUNZCxhnEeu74r7X1vovKw" points="[0, -71, 572, 110]$[-572, -131, 0, 50]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUOAFhhnEeu74r7X1vovKw" id="(0.5,0.5)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUOAFxhnEeu74r7X1vovKw" id="(0.5,0.5)"/>
-        </edges>
-<<<<<<< HEAD
-        <edges xmi:type="notation:Edge" xmi:id="_tUOnIBhnEeu74r7X1vovKw" type="4001" element="_tTBtQBhnEeu74r7X1vovKw" source="_tTp_YBhnEeu74r7X1vovKw" target="_tToxRBhnEeu74r7X1vovKw">
-=======
-        <edges xmi:type="notation:Edge" xmi:id="_tUOnIBhnEeu74r7X1vovKw" type="4001" element="_OD1CRgRpEe6qzcyNffzqYg" source="_tTp_YBhnEeu74r7X1vovKw" target="_tToxRBhnEeu74r7X1vovKw">
->>>>>>> master
-          <children xmi:type="notation:Node" xmi:id="_tUOnJBhnEeu74r7X1vovKw" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUOnJRhnEeu74r7X1vovKw" y="-10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_tUOnJhhnEeu74r7X1vovKw" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUOnJxhnEeu74r7X1vovKw" y="10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_tUOnKBhnEeu74r7X1vovKw" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUOnKRhnEeu74r7X1vovKw" y="10"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_tUOnIRhnEeu74r7X1vovKw" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_tUOnIhhnEeu74r7X1vovKw" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tUOnIxhnEeu74r7X1vovKw" points="[0, -71, 572, 110]$[-572, -131, 0, 50]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUOnKhhnEeu74r7X1vovKw" id="(0.5,0.5)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUOnKxhnEeu74r7X1vovKw" id="(0.5,0.5)"/>
-        </edges>
-<<<<<<< HEAD
-        <edges xmi:type="notation:Edge" xmi:id="_tUPOMBhnEeu74r7X1vovKw" type="4001" element="_tTCUUBhnEeu74r7X1vovKw" source="_tTp_YBhnEeu74r7X1vovKw" target="_tToKMxhnEeu74r7X1vovKw">
-=======
-        <edges xmi:type="notation:Edge" xmi:id="_tUPOMBhnEeu74r7X1vovKw" type="4001" element="_OD2QYARpEe6qzcyNffzqYg" source="_tTp_YBhnEeu74r7X1vovKw" target="_tToKMxhnEeu74r7X1vovKw">
->>>>>>> master
-          <children xmi:type="notation:Node" xmi:id="_tUPONBhnEeu74r7X1vovKw" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUPONRhnEeu74r7X1vovKw" y="-10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_tUPONhhnEeu74r7X1vovKw" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUPONxhnEeu74r7X1vovKw" y="10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_tUPOOBhnEeu74r7X1vovKw" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUPOORhnEeu74r7X1vovKw" y="10"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_tUPOMRhnEeu74r7X1vovKw" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_tUPOMhhnEeu74r7X1vovKw" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tUPOMxhnEeu74r7X1vovKw" points="[0, -71, 774, 270]$[-189, -132, 585, 209]$[-191, -231, 583, 110]$[-774, -291, 0, 50]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUPOOhhnEeu74r7X1vovKw" id="(0.5,0.5)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUPOOxhnEeu74r7X1vovKw" id="(0.5,0.5)"/>
-        </edges>
-<<<<<<< HEAD
-        <edges xmi:type="notation:Edge" xmi:id="_tUP1QBhnEeu74r7X1vovKw" type="4001" element="_tTC7YBhnEeu74r7X1vovKw" source="_tTp_ZxhnEeu74r7X1vovKw" target="_tToKMxhnEeu74r7X1vovKw">
-=======
-        <edges xmi:type="notation:Edge" xmi:id="_tUP1QBhnEeu74r7X1vovKw" type="4001" element="_OD23cARpEe6qzcyNffzqYg" source="_tTp_ZxhnEeu74r7X1vovKw" target="_tToKMxhnEeu74r7X1vovKw">
->>>>>>> master
-          <children xmi:type="notation:Node" xmi:id="_tUP1RBhnEeu74r7X1vovKw" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUP1RRhnEeu74r7X1vovKw" y="-10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_tUP1RhhnEeu74r7X1vovKw" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUP1RxhnEeu74r7X1vovKw" y="10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_tUP1SBhnEeu74r7X1vovKw" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUP1SRhnEeu74r7X1vovKw" y="10"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_tUP1QRhnEeu74r7X1vovKw" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_tUP1QhhnEeu74r7X1vovKw" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tUP1QxhnEeu74r7X1vovKw" points="[0, -71, 558, 270]$[-154, -132, 404, 209]$[-156, -231, 402, 110]$[-558, -291, 0, 50]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUP1ShhnEeu74r7X1vovKw" id="(0.5,0.5)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUP1SxhnEeu74r7X1vovKw" id="(0.5,0.5)"/>
-        </edges>
-<<<<<<< HEAD
-        <edges xmi:type="notation:Edge" xmi:id="_tUP1TBhnEeu74r7X1vovKw" type="4001" element="_tTDicBhnEeu74r7X1vovKw" source="_tTp_ZxhnEeu74r7X1vovKw" target="_tToxRBhnEeu74r7X1vovKw">
-=======
-        <edges xmi:type="notation:Edge" xmi:id="_tUP1TBhnEeu74r7X1vovKw" type="4001" element="_OD3egwRpEe6qzcyNffzqYg" source="_tTp_ZxhnEeu74r7X1vovKw" target="_tToxRBhnEeu74r7X1vovKw">
->>>>>>> master
-          <children xmi:type="notation:Node" xmi:id="_tUQcUBhnEeu74r7X1vovKw" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUQcURhnEeu74r7X1vovKw" y="-10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_tUQcUhhnEeu74r7X1vovKw" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUQcUxhnEeu74r7X1vovKw" y="10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_tUQcVBhnEeu74r7X1vovKw" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUQcVRhnEeu74r7X1vovKw" y="10"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_tUP1TRhnEeu74r7X1vovKw" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_tUP1ThhnEeu74r7X1vovKw" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tUP1TxhnEeu74r7X1vovKw" points="[0, -71, 356, 110]$[-356, -131, 0, 50]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUQcVhhnEeu74r7X1vovKw" id="(0.5,0.5)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUQcVxhnEeu74r7X1vovKw" id="(0.5,0.5)"/>
-        </edges>
-<<<<<<< HEAD
-        <edges xmi:type="notation:Edge" xmi:id="_tUY_MhhnEeu74r7X1vovKw" type="4001" element="_tTK3MBhnEeu74r7X1vovKw" source="_tTuQ1BhnEeu74r7X1vovKw" target="_tToxRBhnEeu74r7X1vovKw">
-=======
-        <edges xmi:type="notation:Edge" xmi:id="_tUY_MhhnEeu74r7X1vovKw" type="4001" element="_OD4FkwRpEe6qzcyNffzqYg" source="_tTuQ1BhnEeu74r7X1vovKw" target="_tToxRBhnEeu74r7X1vovKw">
->>>>>>> master
-          <children xmi:type="notation:Node" xmi:id="_tUY_NhhnEeu74r7X1vovKw" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUY_NxhnEeu74r7X1vovKw" y="-10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_tUY_OBhnEeu74r7X1vovKw" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUY_ORhnEeu74r7X1vovKw" y="10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_tUY_OhhnEeu74r7X1vovKw" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUY_OxhnEeu74r7X1vovKw" y="10"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_tUY_MxhnEeu74r7X1vovKw" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_tUY_NBhnEeu74r7X1vovKw" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tUY_NRhnEeu74r7X1vovKw" points="[0, -71, -1280, 110]$[1280, -131, 0, 50]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUY_PBhnEeu74r7X1vovKw" id="(0.5,0.5)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUY_PRhnEeu74r7X1vovKw" id="(0.5,0.5)"/>
-        </edges>
-<<<<<<< HEAD
-        <edges xmi:type="notation:Edge" xmi:id="_tUZmQBhnEeu74r7X1vovKw" type="4001" element="_tTLeQxhnEeu74r7X1vovKw" source="_tTuQ1BhnEeu74r7X1vovKw" target="_tTsboBhnEeu74r7X1vovKw">
-=======
-        <edges xmi:type="notation:Edge" xmi:id="_tUZmQBhnEeu74r7X1vovKw" type="4001" element="_OD4spgRpEe6qzcyNffzqYg" source="_tTuQ1BhnEeu74r7X1vovKw" target="_tTsboBhnEeu74r7X1vovKw">
->>>>>>> master
-          <children xmi:type="notation:Node" xmi:id="_tUZmRBhnEeu74r7X1vovKw" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUZmRRhnEeu74r7X1vovKw" y="-10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_tUZmRhhnEeu74r7X1vovKw" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUZmRxhnEeu74r7X1vovKw" y="10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_tUZmSBhnEeu74r7X1vovKw" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUZmSRhnEeu74r7X1vovKw" y="10"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_tUZmQRhnEeu74r7X1vovKw" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_tUZmQhhnEeu74r7X1vovKw" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tUZmQxhnEeu74r7X1vovKw" points="[0, -71, -543, 110]$[543, -131, 0, 50]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUZmShhnEeu74r7X1vovKw" id="(0.5,0.5)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUZmSxhnEeu74r7X1vovKw" id="(0.5,0.5)"/>
-        </edges>
-<<<<<<< HEAD
-        <edges xmi:type="notation:Edge" xmi:id="_tUZmTBhnEeu74r7X1vovKw" type="4001" element="_tTMFUBhnEeu74r7X1vovKw" source="_tTuQ1BhnEeu74r7X1vovKw" target="_tToKMxhnEeu74r7X1vovKw">
-=======
-        <edges xmi:type="notation:Edge" xmi:id="_tUZmTBhnEeu74r7X1vovKw" type="4001" element="_OD5TtgRpEe6qzcyNffzqYg" source="_tTuQ1BhnEeu74r7X1vovKw" target="_tToKMxhnEeu74r7X1vovKw">
->>>>>>> master
-          <children xmi:type="notation:Node" xmi:id="_tUaNUBhnEeu74r7X1vovKw" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUaNURhnEeu74r7X1vovKw" y="-10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_tUaNUhhnEeu74r7X1vovKw" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUaNUxhnEeu74r7X1vovKw" y="10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_tUaNVBhnEeu74r7X1vovKw" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUaNVRhnEeu74r7X1vovKw" y="10"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_tUZmTRhnEeu74r7X1vovKw" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_tUZmThhnEeu74r7X1vovKw" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tUZmTxhnEeu74r7X1vovKw" points="[0, -71, -1078, 270]$[1, -231, -1077, 110]$[1078, -291, 0, 50]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUaNVhhnEeu74r7X1vovKw" id="(0.5,0.5)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUaNVxhnEeu74r7X1vovKw" id="(0.5,0.5)"/>
-        </edges>
-<<<<<<< HEAD
-        <edges xmi:type="notation:Edge" xmi:id="_tUaNWBhnEeu74r7X1vovKw" type="4001" element="_tTMFVBhnEeu74r7X1vovKw" source="_tTuQ1BhnEeu74r7X1vovKw" target="_tToKMxhnEeu74r7X1vovKw">
-=======
-        <edges xmi:type="notation:Edge" xmi:id="_tUaNWBhnEeu74r7X1vovKw" type="4001" element="_OD6h1gRpEe6qzcyNffzqYg" source="_tTuQ1BhnEeu74r7X1vovKw" target="_tToKMxhnEeu74r7X1vovKw">
->>>>>>> master
-          <children xmi:type="notation:Node" xmi:id="_tUaNXBhnEeu74r7X1vovKw" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUaNXRhnEeu74r7X1vovKw" y="-10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_tUa0YBhnEeu74r7X1vovKw" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUa0YRhnEeu74r7X1vovKw" y="10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_tUa0YhhnEeu74r7X1vovKw" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUa0YxhnEeu74r7X1vovKw" y="10"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_tUaNWRhnEeu74r7X1vovKw" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_tUaNWhhnEeu74r7X1vovKw" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tUaNWxhnEeu74r7X1vovKw" points="[0, -71, -1078, 270]$[-177, -132, -1255, 209]$[-177, -231, -1255, 110]$[1078, -291, 0, 50]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUa0ZBhnEeu74r7X1vovKw" id="(0.5,0.5)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUa0ZRhnEeu74r7X1vovKw" id="(0.5,0.5)"/>
-        </edges>
-<<<<<<< HEAD
-        <edges xmi:type="notation:Edge" xmi:id="_tUa0ZhhnEeu74r7X1vovKw" type="4001" element="_tTMsYxhnEeu74r7X1vovKw" source="_tTu34BhnEeu74r7X1vovKw" target="_tTu35xhnEeu74r7X1vovKw">
-=======
-        <edges xmi:type="notation:Edge" xmi:id="_tUa0ZhhnEeu74r7X1vovKw" type="4001" element="_OD7I5gRpEe6qzcyNffzqYg" source="_tTu34BhnEeu74r7X1vovKw" target="_tTu35xhnEeu74r7X1vovKw">
->>>>>>> master
-          <children xmi:type="notation:Node" xmi:id="_tUbbcBhnEeu74r7X1vovKw" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUbbcRhnEeu74r7X1vovKw" y="-10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_tUbbchhnEeu74r7X1vovKw" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUbbcxhnEeu74r7X1vovKw" y="10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_tUbbdBhnEeu74r7X1vovKw" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUbbdRhnEeu74r7X1vovKw" y="10"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_tUa0ZxhnEeu74r7X1vovKw" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_tUa0aBhnEeu74r7X1vovKw" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tUa0aRhnEeu74r7X1vovKw" points="[0, -71, -40, 110]$[40, -131, 0, 50]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUbbdhhnEeu74r7X1vovKw" id="(0.5,0.5)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUbbdxhnEeu74r7X1vovKw" id="(0.5,0.5)"/>
-        </edges>
-<<<<<<< HEAD
-        <edges xmi:type="notation:Edge" xmi:id="_tUbbeBhnEeu74r7X1vovKw" type="4001" element="_tTNTcxhnEeu74r7X1vovKw" source="_tTwGABhnEeu74r7X1vovKw" target="_tToKMxhnEeu74r7X1vovKw">
-=======
-        <edges xmi:type="notation:Edge" xmi:id="_tUbbeBhnEeu74r7X1vovKw" type="4001" element="_OD7v9gRpEe6qzcyNffzqYg" source="_tTwGABhnEeu74r7X1vovKw" target="_tToKMxhnEeu74r7X1vovKw">
->>>>>>> master
-          <children xmi:type="notation:Node" xmi:id="_tUbbfBhnEeu74r7X1vovKw" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUbbfRhnEeu74r7X1vovKw" y="-10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_tUbbfhhnEeu74r7X1vovKw" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUbbfxhnEeu74r7X1vovKw" y="10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_tUcCgBhnEeu74r7X1vovKw" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUcCgRhnEeu74r7X1vovKw" y="10"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_tUbbeRhnEeu74r7X1vovKw" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_tUbbehhnEeu74r7X1vovKw" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tUbbexhnEeu74r7X1vovKw" points="[0, 0, -355, 60]$[355, -60, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUcCghhnEeu74r7X1vovKw" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUcCgxhnEeu74r7X1vovKw" id="(0.5,1.0)"/>
-        </edges>
-<<<<<<< HEAD
-        <edges xmi:type="notation:Edge" xmi:id="_tUcChBhnEeu74r7X1vovKw" type="4001" element="_tTN6gxhnEeu74r7X1vovKw" source="_tTxUIxhnEeu74r7X1vovKw" target="_tTx7NBhnEeu74r7X1vovKw">
-=======
-        <edges xmi:type="notation:Edge" xmi:id="_tUcChBhnEeu74r7X1vovKw" type="4001" element="_OD8XBgRpEe6qzcyNffzqYg" source="_tTxUIxhnEeu74r7X1vovKw" target="_tTx7NBhnEeu74r7X1vovKw">
->>>>>>> master
-          <children xmi:type="notation:Node" xmi:id="_tUcCiBhnEeu74r7X1vovKw" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUcCiRhnEeu74r7X1vovKw" y="-10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_tUcCihhnEeu74r7X1vovKw" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUcCixhnEeu74r7X1vovKw" y="10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_tUcCjBhnEeu74r7X1vovKw" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUcCjRhnEeu74r7X1vovKw" y="10"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_tUcChRhnEeu74r7X1vovKw" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_tUcChhhnEeu74r7X1vovKw" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tUcChxhnEeu74r7X1vovKw" points="[0, -71, 0, 110]$[0, -131, 0, 50]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUcCjhhnEeu74r7X1vovKw" id="(0.5,0.5)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUcCjxhnEeu74r7X1vovKw" id="(0.5,0.5)"/>
-        </edges>
-<<<<<<< HEAD
-        <edges xmi:type="notation:Edge" xmi:id="_tUcpnBhnEeu74r7X1vovKw" type="4001" element="_tTPvsBhnEeu74r7X1vovKw" source="_tTyiRBhnEeu74r7X1vovKw" target="_tTwGABhnEeu74r7X1vovKw">
-=======
-        <edges xmi:type="notation:Edge" xmi:id="_tUcpnBhnEeu74r7X1vovKw" type="4001" element="_OD8-FgRpEe6qzcyNffzqYg" source="_tTyiRBhnEeu74r7X1vovKw" target="_tTwGABhnEeu74r7X1vovKw">
->>>>>>> master
-          <children xmi:type="notation:Node" xmi:id="_tUcpoBhnEeu74r7X1vovKw" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUcpoRhnEeu74r7X1vovKw" y="-10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_tUdQoBhnEeu74r7X1vovKw" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUdQoRhnEeu74r7X1vovKw" y="10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_tUdQohhnEeu74r7X1vovKw" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUdQoxhnEeu74r7X1vovKw" y="10"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_tUcpnRhnEeu74r7X1vovKw" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_tUcpnhhnEeu74r7X1vovKw" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tUcpnxhnEeu74r7X1vovKw" points="[0, 0, -505, 263]$[1, -203, -504, 60]$[505, -263, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUdQpBhnEeu74r7X1vovKw" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUdQpRhnEeu74r7X1vovKw" id="(0.5,1.0)"/>
-        </edges>
-<<<<<<< HEAD
-        <edges xmi:type="notation:Edge" xmi:id="_tUdQphhnEeu74r7X1vovKw" type="4001" element="_tTQWwBhnEeu74r7X1vovKw" source="_tTyiRBhnEeu74r7X1vovKw" target="_tTlt8BhnEeu74r7X1vovKw">
-=======
-        <edges xmi:type="notation:Edge" xmi:id="_tUdQphhnEeu74r7X1vovKw" type="4001" element="_OD9lIwRpEe6qzcyNffzqYg" source="_tTyiRBhnEeu74r7X1vovKw" target="_tTlt8BhnEeu74r7X1vovKw">
->>>>>>> master
-          <children xmi:type="notation:Node" xmi:id="_tUdQqhhnEeu74r7X1vovKw" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUdQqxhnEeu74r7X1vovKw" x="-63" y="-10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_tUdQrBhnEeu74r7X1vovKw" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUdQrRhnEeu74r7X1vovKw" x="-19" y="10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_tUdQrhhnEeu74r7X1vovKw" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUdQrxhnEeu74r7X1vovKw" x="-107" y="10"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_tUdQpxhnEeu74r7X1vovKw" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_tUdQqBhnEeu74r7X1vovKw" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tUdQqRhnEeu74r7X1vovKw" points="[59, 47, -2045, 113]$[2104, 47, 0, 113]$[2104, -66, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUd3sBhnEeu74r7X1vovKw" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUd3sRhnEeu74r7X1vovKw" id="(0.5,1.0)"/>
-        </edges>
-<<<<<<< HEAD
-        <edges xmi:type="notation:Edge" xmi:id="_tUd3shhnEeu74r7X1vovKw" type="4001" element="_tTQ90BhnEeu74r7X1vovKw" source="_tTyiRBhnEeu74r7X1vovKw" target="_tTu34BhnEeu74r7X1vovKw">
-=======
-        <edges xmi:type="notation:Edge" xmi:id="_tUd3shhnEeu74r7X1vovKw" type="4001" element="_OD-MMwRpEe6qzcyNffzqYg" source="_tTyiRBhnEeu74r7X1vovKw" target="_tTu34BhnEeu74r7X1vovKw">
->>>>>>> master
-          <children xmi:type="notation:Node" xmi:id="_tUd3thhnEeu74r7X1vovKw" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUd3txhnEeu74r7X1vovKw" y="-10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_tUd3uBhnEeu74r7X1vovKw" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUd3uRhnEeu74r7X1vovKw" y="10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_tUd3uhhnEeu74r7X1vovKw" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUd3uxhnEeu74r7X1vovKw" y="10"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_tUd3sxhnEeu74r7X1vovKw" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_tUd3tBhnEeu74r7X1vovKw" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tUd3tRhnEeu74r7X1vovKw" points="[0, 0, -2671, 60]$[2671, -60, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUd3vBhnEeu74r7X1vovKw" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUd3vRhnEeu74r7X1vovKw" id="(0.5,1.0)"/>
-        </edges>
-<<<<<<< HEAD
-        <edges xmi:type="notation:Edge" xmi:id="_tUd3vhhnEeu74r7X1vovKw" type="4001" element="_tTRk4BhnEeu74r7X1vovKw" source="_tTyiRBhnEeu74r7X1vovKw" target="_tTxUIxhnEeu74r7X1vovKw">
-=======
-        <edges xmi:type="notation:Edge" xmi:id="_tUd3vhhnEeu74r7X1vovKw" type="4001" element="_OEMOoARpEe6qzcyNffzqYg" source="_tTyiRBhnEeu74r7X1vovKw" target="_tTxUIxhnEeu74r7X1vovKw">
->>>>>>> master
-          <children xmi:type="notation:Node" xmi:id="_tUeewRhnEeu74r7X1vovKw" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUeewhhnEeu74r7X1vovKw" y="-10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_tUeewxhnEeu74r7X1vovKw" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUeexBhnEeu74r7X1vovKw" y="10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_tUeexRhnEeu74r7X1vovKw" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUeexhhnEeu74r7X1vovKw" y="10"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_tUd3vxhnEeu74r7X1vovKw" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_tUd3wBhnEeu74r7X1vovKw" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tUeewBhnEeu74r7X1vovKw" points="[0, 0, -2491, 60]$[2491, -60, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUeexxhnEeu74r7X1vovKw" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUeeyBhnEeu74r7X1vovKw" id="(0.5,1.0)"/>
-        </edges>
-<<<<<<< HEAD
-        <edges xmi:type="notation:Edge" xmi:id="_tUfF1hhnEeu74r7X1vovKw" type="4001" element="_tTSzABhnEeu74r7X1vovKw" source="_tTyiRBhnEeu74r7X1vovKw" target="_tT0-hxhnEeu74r7X1vovKw">
-          <children xmi:type="notation:Node" xmi:id="_tUfF2hhnEeu74r7X1vovKw" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUfF2xhnEeu74r7X1vovKw" x="4" y="-87"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_tUfF3BhnEeu74r7X1vovKw" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUfF3RhnEeu74r7X1vovKw" y="10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_tUfF3hhnEeu74r7X1vovKw" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUfF3xhnEeu74r7X1vovKw" y="10"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_tUfF1xhnEeu74r7X1vovKw" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_tUfF2BhnEeu74r7X1vovKw" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tUfF2RhnEeu74r7X1vovKw" points="[0, -50, 663, 132]$[-663, -110, 0, 72]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUfF4BhnEeu74r7X1vovKw" id="(0.5,0.5)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUfF4RhnEeu74r7X1vovKw" id="(0.5,0.5)"/>
-        </edges>
-        <edges xmi:type="notation:Edge" xmi:id="_tUfs4BhnEeu74r7X1vovKw" type="4001" element="_tTTaEBhnEeu74r7X1vovKw" source="_tTyiRBhnEeu74r7X1vovKw" target="_tT1llBhnEeu74r7X1vovKw">
-          <children xmi:type="notation:Node" xmi:id="_tUfs5BhnEeu74r7X1vovKw" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUfs5RhnEeu74r7X1vovKw" y="-10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_tUfs5hhnEeu74r7X1vovKw" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUfs5xhnEeu74r7X1vovKw" y="10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_tUfs6BhnEeu74r7X1vovKw" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUfs6RhnEeu74r7X1vovKw" y="10"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_tUfs4RhnEeu74r7X1vovKw" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_tUfs4hhnEeu74r7X1vovKw" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tUfs4xhnEeu74r7X1vovKw" points="[0, -50, 448, 132]$[-448, -110, 0, 72]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUfs6hhnEeu74r7X1vovKw" id="(0.5,0.5)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUfs6xhnEeu74r7X1vovKw" id="(0.5,0.5)"/>
-        </edges>
-        <edges xmi:type="notation:Edge" xmi:id="_tUgT9hhnEeu74r7X1vovKw" type="4001" element="_tTXEcBhnEeu74r7X1vovKw" source="_tTpYVBhnEeu74r7X1vovKw" target="_tToxRBhnEeu74r7X1vovKw">
-=======
-        <edges xmi:type="notation:Edge" xmi:id="_tUgT9hhnEeu74r7X1vovKw" type="4001" element="_OEOq4ARpEe6qzcyNffzqYg" source="_tTpYVBhnEeu74r7X1vovKw" target="_tToxRBhnEeu74r7X1vovKw">
->>>>>>> master
-          <children xmi:type="notation:Node" xmi:id="_tUgT-hhnEeu74r7X1vovKw" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUgT-xhnEeu74r7X1vovKw" y="-10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_tUgT_BhnEeu74r7X1vovKw" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUgT_RhnEeu74r7X1vovKw" y="10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_tUgT_hhnEeu74r7X1vovKw" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUgT_xhnEeu74r7X1vovKw" y="10"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_tUgT9xhnEeu74r7X1vovKw" routing="Tree"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_tUgT-BhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tUgT-RhnEeu74r7X1vovKw" points="[0, 0, -238, 60]$[238, -60, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUgUABhnEeu74r7X1vovKw" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUg7ABhnEeu74r7X1vovKw" id="(0.5,1.0)"/>
-        </edges>
-<<<<<<< HEAD
-        <edges xmi:type="notation:Edge" xmi:id="_tUg7ARhnEeu74r7X1vovKw" type="4001" element="_tTYSkxhnEeu74r7X1vovKw" source="_tTp_YBhnEeu74r7X1vovKw" target="_tToxRBhnEeu74r7X1vovKw">
-=======
-        <edges xmi:type="notation:Edge" xmi:id="_tUg7ARhnEeu74r7X1vovKw" type="4001" element="_OERHIwRpEe6qzcyNffzqYg" source="_tTp_YBhnEeu74r7X1vovKw" target="_tToxRBhnEeu74r7X1vovKw">
->>>>>>> master
-          <children xmi:type="notation:Node" xmi:id="_tUg7BRhnEeu74r7X1vovKw" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUg7BhhnEeu74r7X1vovKw" y="-10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_tUg7BxhnEeu74r7X1vovKw" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUg7CBhnEeu74r7X1vovKw" y="10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_tUg7CRhnEeu74r7X1vovKw" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUg7ChhnEeu74r7X1vovKw" y="10"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_tUg7AhhnEeu74r7X1vovKw" routing="Tree"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_tUg7AxhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tUg7BBhnEeu74r7X1vovKw" points="[0, 0, 572, 60]$[-572, -60, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUg7CxhnEeu74r7X1vovKw" id="(0.49645390070921985,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUg7DBhnEeu74r7X1vovKw" id="(0.5,1.0)"/>
-        </edges>
-<<<<<<< HEAD
-        <edges xmi:type="notation:Edge" xmi:id="_tUg7DRhnEeu74r7X1vovKw" type="4001" element="_tTY5oxhnEeu74r7X1vovKw" source="_tTp_ZxhnEeu74r7X1vovKw" target="_tToxRBhnEeu74r7X1vovKw">
-=======
-        <edges xmi:type="notation:Edge" xmi:id="_tUg7DRhnEeu74r7X1vovKw" type="4001" element="_OERuNgRpEe6qzcyNffzqYg" source="_tTp_ZxhnEeu74r7X1vovKw" target="_tToxRBhnEeu74r7X1vovKw">
->>>>>>> master
-          <children xmi:type="notation:Node" xmi:id="_tUhiEBhnEeu74r7X1vovKw" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUhiERhnEeu74r7X1vovKw" y="-10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_tUhiEhhnEeu74r7X1vovKw" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUhiExhnEeu74r7X1vovKw" y="10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_tUhiFBhnEeu74r7X1vovKw" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUhiFRhnEeu74r7X1vovKw" y="10"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_tUg7DhhnEeu74r7X1vovKw" routing="Tree"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_tUg7DxhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tUg7EBhnEeu74r7X1vovKw" points="[0, 0, 356, 60]$[-356, -60, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUhiFhhnEeu74r7X1vovKw" id="(0.4970760233918129,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUhiFxhnEeu74r7X1vovKw" id="(0.5,1.0)"/>
-        </edges>
-<<<<<<< HEAD
-        <edges xmi:type="notation:Edge" xmi:id="_tUiJLhhnEeu74r7X1vovKw" type="4001" element="_tTaHxBhnEeu74r7X1vovKw" source="_tTsbpxhnEeu74r7X1vovKw" target="_tToxRBhnEeu74r7X1vovKw">
-=======
-        <edges xmi:type="notation:Edge" xmi:id="_tUiJLhhnEeu74r7X1vovKw" type="4001" element="_OES8VgRpEe6qzcyNffzqYg" source="_tTsbpxhnEeu74r7X1vovKw" target="_tToxRBhnEeu74r7X1vovKw">
->>>>>>> master
-          <children xmi:type="notation:Node" xmi:id="_tUiwMRhnEeu74r7X1vovKw" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUiwMhhnEeu74r7X1vovKw" y="-10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_tUiwMxhnEeu74r7X1vovKw" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUiwNBhnEeu74r7X1vovKw" y="10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_tUiwNRhnEeu74r7X1vovKw" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUiwNhhnEeu74r7X1vovKw" y="10"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_tUiJLxhnEeu74r7X1vovKw" routing="Tree"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_tUiJMBhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tUiwMBhnEeu74r7X1vovKw" points="[0, 0, -418, 60]$[418, -60, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUiwNxhnEeu74r7X1vovKw" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUiwOBhnEeu74r7X1vovKw" id="(0.5,1.0)"/>
-        </edges>
-<<<<<<< HEAD
-        <edges xmi:type="notation:Edge" xmi:id="_tUjXSBhnEeu74r7X1vovKw" type="4001" element="_tTckABhnEeu74r7X1vovKw" source="_tTuQ1BhnEeu74r7X1vovKw" target="_tToxRBhnEeu74r7X1vovKw">
-=======
-        <edges xmi:type="notation:Edge" xmi:id="_tUjXSBhnEeu74r7X1vovKw" type="4001" element="_OEaREARpEe6qzcyNffzqYg" source="_tTuQ1BhnEeu74r7X1vovKw" target="_tToxRBhnEeu74r7X1vovKw">
->>>>>>> master
-          <children xmi:type="notation:Node" xmi:id="_tUjXTBhnEeu74r7X1vovKw" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUjXTRhnEeu74r7X1vovKw" y="-10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_tUjXThhnEeu74r7X1vovKw" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUjXTxhnEeu74r7X1vovKw" y="10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_tUj-UBhnEeu74r7X1vovKw" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUj-URhnEeu74r7X1vovKw" y="10"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_tUjXSRhnEeu74r7X1vovKw" routing="Tree"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_tUjXShhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tUjXSxhnEeu74r7X1vovKw" points="[0, 0, -1280, 60]$[1280, -60, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUj-UhhnEeu74r7X1vovKw" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUj-UxhnEeu74r7X1vovKw" id="(0.5,1.0)"/>
-        </edges>
-<<<<<<< HEAD
-        <edges xmi:type="notation:Edge" xmi:id="_tUj-VBhnEeu74r7X1vovKw" type="4001" element="_tTdLEBhnEeu74r7X1vovKw" source="_tTzJUxhnEeu74r7X1vovKw" target="_tToxRBhnEeu74r7X1vovKw">
-=======
-        <edges xmi:type="notation:Edge" xmi:id="_tUj-VBhnEeu74r7X1vovKw" type="4001" element="_OEa4IARpEe6qzcyNffzqYg" source="_tTzJUxhnEeu74r7X1vovKw" target="_tToxRBhnEeu74r7X1vovKw">
->>>>>>> master
-          <children xmi:type="notation:Node" xmi:id="_tUj-WBhnEeu74r7X1vovKw" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUj-WRhnEeu74r7X1vovKw" y="-10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_tUj-WhhnEeu74r7X1vovKw" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUj-WxhnEeu74r7X1vovKw" y="10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_tUj-XBhnEeu74r7X1vovKw" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUj-XRhnEeu74r7X1vovKw" y="10"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_tUj-VRhnEeu74r7X1vovKw" routing="Tree"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_tUj-VhhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tUj-VxhnEeu74r7X1vovKw" points="[0, 0, -44, 60]$[44, -60, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUklYBhnEeu74r7X1vovKw" id="(0.4966442953020134,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUklYRhnEeu74r7X1vovKw" id="(0.5,1.0)"/>
-        </edges>
-<<<<<<< HEAD
-        <edges xmi:type="notation:Edge" xmi:id="_tUklYhhnEeu74r7X1vovKw" type="4001" element="_tTdyIBhnEeu74r7X1vovKw" source="_tToxRBhnEeu74r7X1vovKw" target="_tToxRBhnEeu74r7X1vovKw">
-=======
-        <edges xmi:type="notation:Edge" xmi:id="_tUklYhhnEeu74r7X1vovKw" type="4001" element="_OEcGQARpEe6qzcyNffzqYg" source="_tToxRBhnEeu74r7X1vovKw" target="_tToxRBhnEeu74r7X1vovKw">
->>>>>>> master
-          <children xmi:type="notation:Node" xmi:id="_tUklZhhnEeu74r7X1vovKw" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUklZxhnEeu74r7X1vovKw" y="-10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_tUklaBhnEeu74r7X1vovKw" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUklaRhnEeu74r7X1vovKw" y="10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_tUklahhnEeu74r7X1vovKw" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tUklaxhnEeu74r7X1vovKw" y="10"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_tUklYxhnEeu74r7X1vovKw" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_tUklZBhnEeu74r7X1vovKw" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tUklZRhnEeu74r7X1vovKw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUklbBhnEeu74r7X1vovKw" id="(0.5,0.5)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tUklbRhnEeu74r7X1vovKw" id="(0.5,0.5)"/>
-        </edges>
-<<<<<<< HEAD
-      </data>
-    </ownedAnnotationEntries>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_tR6S8BhnEeu74r7X1vovKw" name="CbCFormula" tooltipText="" outgoingEdges="_tS80wBhnEeu74r7X1vovKw _tS-p8BhnEeu74r7X1vovKw _tS_RABhnEeu74r7X1vovKw" incomingEdges="_tTQWwBhnEeu74r7X1vovKw" width="12" height="10">
-=======
-        <edges xmi:type="notation:Edge" xmi:id="_8P3RYARoEe6qzcyNffzqYg" type="4001" element="_ODww0wRpEe6qzcyNffzqYg" source="_tTlt8BhnEeu74r7X1vovKw" target="_8PtgYARoEe6qzcyNffzqYg">
-          <children xmi:type="notation:Node" xmi:id="_8P4fgARoEe6qzcyNffzqYg" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8P4fgQRoEe6qzcyNffzqYg" x="-1034" y="-53"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_8P5GkARoEe6qzcyNffzqYg" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8P5GkQRoEe6qzcyNffzqYg" x="-229" y="-431"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_8P5GkgRoEe6qzcyNffzqYg" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8P5GkwRoEe6qzcyNffzqYg" x="-1740" y="10"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_8P3RYQRoEe6qzcyNffzqYg" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_8P3RYgRoEe6qzcyNffzqYg" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8P3RYwRoEe6qzcyNffzqYg" points="[206, -78, 3113, 181]$[206, -237, 3113, 22]$[-2848, -237, 59, 22]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8P9_EARoEe6qzcyNffzqYg" id="(0.5,0.5)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8P9_EQRoEe6qzcyNffzqYg" id="(0.5,0.5)"/>
-        </edges>
-        <edges xmi:type="notation:Edge" xmi:id="_8P-mIARoEe6qzcyNffzqYg" type="4001" element="_ODxX4wRpEe6qzcyNffzqYg" source="_tTlt8BhnEeu74r7X1vovKw" target="_8Pxx0wRoEe6qzcyNffzqYg">
-          <children xmi:type="notation:Node" xmi:id="_8P-mJARoEe6qzcyNffzqYg" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8P-mJQRoEe6qzcyNffzqYg" x="-1224" y="-1435"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_8P-mJgRoEe6qzcyNffzqYg" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8P-mJwRoEe6qzcyNffzqYg" x="2" y="7"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_8P_NMARoEe6qzcyNffzqYg" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8P_NMQRoEe6qzcyNffzqYg" x="-1879" y="-48"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_8P-mIQRoEe6qzcyNffzqYg" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_8P-mIgRoEe6qzcyNffzqYg" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8P-mIwRoEe6qzcyNffzqYg" points="[208, -69, 2911, 190]$[367, -69, 3070, 190]$[367, -232, 3070, 27]$[-2620, -232, 83, 27]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8P_NMgRoEe6qzcyNffzqYg" id="(0.5,0.5)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8P_NMwRoEe6qzcyNffzqYg" id="(0.5,0.5)"/>
-        </edges>
-        <edges xmi:type="notation:Edge" xmi:id="_8P_NNARoEe6qzcyNffzqYg" type="4001" element="_ODx-9gRpEe6qzcyNffzqYg" source="_tToKMxhnEeu74r7X1vovKw" target="_8PxKwwRoEe6qzcyNffzqYg">
-          <children xmi:type="notation:Node" xmi:id="_8P_0QARoEe6qzcyNffzqYg" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8P_0QQRoEe6qzcyNffzqYg" x="-542" y="997"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_8P_0QgRoEe6qzcyNffzqYg" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8P_0QwRoEe6qzcyNffzqYg" x="-533" y="10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_8P_0RARoEe6qzcyNffzqYg" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8P_0RQRoEe6qzcyNffzqYg" x="-803" y="10"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_8P_NNQRoEe6qzcyNffzqYg" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_8P_NNgRoEe6qzcyNffzqYg" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8P_NNwRoEe6qzcyNffzqYg" points="[73, -18, 1621, -216]$[835, -18, 2383, -216]$[835, 214, 2383, 16]$[-1489, 214, 59, 16]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8QAbUARoEe6qzcyNffzqYg" id="(0.5,0.5)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8QAbUQRoEe6qzcyNffzqYg" id="(0.5,0.5)"/>
-        </edges>
-        <edges xmi:type="notation:Edge" xmi:id="_8QAbUgRoEe6qzcyNffzqYg" type="4001" element="_ODymBgRpEe6qzcyNffzqYg" source="_tToKMxhnEeu74r7X1vovKw" target="_8PwjsARoEe6qzcyNffzqYg">
-          <children xmi:type="notation:Node" xmi:id="_8QAbVgRoEe6qzcyNffzqYg" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8QAbVwRoEe6qzcyNffzqYg" x="-645" y="1082"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_8QAbWARoEe6qzcyNffzqYg" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8QAbWQRoEe6qzcyNffzqYg" x="-591" y="10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_8QAbWgRoEe6qzcyNffzqYg" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8QAbWwRoEe6qzcyNffzqYg" x="-1005" y="10"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_8QAbUwRoEe6qzcyNffzqYg" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_8QAbVARoEe6qzcyNffzqYg" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8QAbVQRoEe6qzcyNffzqYg" points="[73, -18, 1826, -208]$[833, -18, 2586, -208]$[833, 206, 2586, 16]$[-1694, 206, 59, 16]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8QBCYARoEe6qzcyNffzqYg" id="(0.5,0.5)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8QBCYQRoEe6qzcyNffzqYg" id="(0.5,0.5)"/>
-        </edges>
-        <edges xmi:type="notation:Edge" xmi:id="_8QBCYgRoEe6qzcyNffzqYg" type="4001" element="_OEM1sARpEe6qzcyNffzqYg" source="_8PwjsARoEe6qzcyNffzqYg" target="_8PtgYARoEe6qzcyNffzqYg">
-          <children xmi:type="notation:Node" xmi:id="_8QBCZgRoEe6qzcyNffzqYg" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8QBCZwRoEe6qzcyNffzqYg" y="-10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_8QBCaARoEe6qzcyNffzqYg" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8QBCaQRoEe6qzcyNffzqYg" x="12"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_8QBCagRoEe6qzcyNffzqYg" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8QBCawRoEe6qzcyNffzqYg" x="-30" y="-1"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_8QBCYwRoEe6qzcyNffzqYg" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_8QBCZARoEe6qzcyNffzqYg" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8QBCZQRoEe6qzcyNffzqYg" points="[0, 0, -10, 65]$[0, -33, -10, 32]$[10, -33, 0, 32]$[10, -65, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8QBpcARoEe6qzcyNffzqYg" id="(0.5084745762711864,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8QBpcQRoEe6qzcyNffzqYg" id="(0.5084745762711864,1.0)"/>
-        </edges>
-        <edges xmi:type="notation:Edge" xmi:id="_8QBpcgRoEe6qzcyNffzqYg" type="4001" element="_OEM1twRpEe6qzcyNffzqYg" source="_8PxKwwRoEe6qzcyNffzqYg" target="_8Pxx0wRoEe6qzcyNffzqYg">
-          <children xmi:type="notation:Node" xmi:id="_8QBpdgRoEe6qzcyNffzqYg" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8QBpdwRoEe6qzcyNffzqYg" x="10" y="4"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_8QBpeARoEe6qzcyNffzqYg" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8QBpeQRoEe6qzcyNffzqYg" x="19"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_8QBpegRoEe6qzcyNffzqYg" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8QBpewRoEe6qzcyNffzqYg" x="-29" y="-1"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_8QBpcwRoEe6qzcyNffzqYg" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_8QBpdARoEe6qzcyNffzqYg" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8QBpdQRoEe6qzcyNffzqYg" points="[0, 0, -9, 73]$[0, -41, -9, 32]$[9, -41, 0, 32]$[9, -73, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8QBpfARoEe6qzcyNffzqYg" id="(0.5084745762711864,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8QBpfQRoEe6qzcyNffzqYg" id="(0.5060240963855421,1.0)"/>
-        </edges>
-      </data>
-    </ownedAnnotationEntries>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_tR6S8BhnEeu74r7X1vovKw" name="CbCFormula" tooltipText="" outgoingEdges="_ODsfYARpEe6qzcyNffzqYg _ODttgwRpEe6qzcyNffzqYg _ODu7oARpEe6qzcyNffzqYg _ODww0wRpEe6qzcyNffzqYg _ODxX4wRpEe6qzcyNffzqYg" incomingEdges="_OD9lIwRpEe6qzcyNffzqYg" width="12" height="10">
->>>>>>> master
-      <target xmi:type="ecore:EClass" href="cbcmodel.ecore#//CbCFormula"/>
-      <semanticElements xmi:type="ecore:EClass" href="cbcmodel.ecore#//CbCFormula"/>
-      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
-      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
-      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_fsclQMefEeuB9ep-drWMrA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
-        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-<<<<<<< HEAD
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_tSm2gBhnEeu74r7X1vovKw" name="name : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//CbCFormula/name"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//CbCFormula/name"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_tSm2gRhnEeu74r7X1vovKw" labelAlignment="LEFT">
-=======
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_ODGCcwRpEe6qzcyNffzqYg" name="name : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//CbCFormula/name"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//CbCFormula/name"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_ODHQkARpEe6qzcyNffzqYg" labelAlignment="LEFT">
->>>>>>> master
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-<<<<<<< HEAD
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_tSndkBhnEeu74r7X1vovKw" name="proven : EBoolean = false" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//CbCFormula/proven"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//CbCFormula/proven"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_tSndkRhnEeu74r7X1vovKw" labelAlignment="LEFT">
-=======
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_ODH3oARpEe6qzcyNffzqYg" name="proven : EBoolean = false" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//CbCFormula/proven"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//CbCFormula/proven"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_ODH3oQRpEe6qzcyNffzqYg" labelAlignment="LEFT">
->>>>>>> master
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-<<<<<<< HEAD
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_tSndkhhnEeu74r7X1vovKw" name="comment : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//CbCFormula/comment"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//CbCFormula/comment"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_tSoEoBhnEeu74r7X1vovKw" labelAlignment="LEFT">
-=======
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_ODIesARpEe6qzcyNffzqYg" name="comment : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//CbCFormula/comment"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//CbCFormula/comment"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_ODIesQRpEe6qzcyNffzqYg" labelAlignment="LEFT">
->>>>>>> master
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-<<<<<<< HEAD
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_tSoEoRhnEeu74r7X1vovKw" name="compositionTechnique : CompositionTechnique = CONTRACT_OVERRIDING" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//CbCFormula/compositionTechnique"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//CbCFormula/compositionTechnique"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_tSoEohhnEeu74r7X1vovKw" labelAlignment="LEFT">
-=======
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_ODIesgRpEe6qzcyNffzqYg" name="compositionTechnique : CompositionTechnique = CONTRACT_OVERRIDING" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//CbCFormula/compositionTechnique"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//CbCFormula/compositionTechnique"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_ODJFwARpEe6qzcyNffzqYg" labelAlignment="LEFT">
->>>>>>> master
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-<<<<<<< HEAD
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_tSorshhnEeu74r7X1vovKw" name="className : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//CbCFormula/className"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//CbCFormula/className"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_QZuqUMLXEeuL1s-RYqMhDw" labelAlignment="LEFT">
-=======
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_ODJFwQRpEe6qzcyNffzqYg" name="className : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//CbCFormula/className"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//CbCFormula/className"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_ODJFwgRpEe6qzcyNffzqYg" labelAlignment="LEFT">
->>>>>>> master
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-<<<<<<< HEAD
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_tSpSwRhnEeu74r7X1vovKw" name="methodName : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//CbCFormula/methodName"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//CbCFormula/methodName"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_BpatIMLWEeuL1s-RYqMhDw" labelAlignment="LEFT">
-=======
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_ODJFwwRpEe6qzcyNffzqYg" name="methodName : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//CbCFormula/methodName"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//CbCFormula/methodName"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_ODJFxARpEe6qzcyNffzqYg" labelAlignment="LEFT">
->>>>>>> master
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-<<<<<<< HEAD
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_NNHw0MksEeurpJGqlvHU8A" name=" methodObj : Method" tooltipText="">
-        <target xmi:type="ecore:EReference" href="cbcmodel.ecore#//CbCFormula/methodObj"/>
-        <semanticElements xmi:type="ecore:EReference" href="cbcmodel.ecore#//CbCFormula/methodObj"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_NNIX4MksEeurpJGqlvHU8A" labelAlignment="LEFT" color="114,159,207">
-=======
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_ODJs0ARpEe6qzcyNffzqYg" name="tested : EBoolean = false" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//CbCFormula/tested"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//CbCFormula/tested"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_ODJs0QRpEe6qzcyNffzqYg" labelAlignment="LEFT">
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_ODKT4ARpEe6qzcyNffzqYg" name=" methodObj : Method" tooltipText="">
-        <target xmi:type="ecore:EReference" href="cbcmodel.ecore#//CbCFormula/methodObj"/>
-        <semanticElements xmi:type="ecore:EReference" href="cbcmodel.ecore#//CbCFormula/methodObj"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_ODK68ARpEe6qzcyNffzqYg" labelAlignment="LEFT" color="114,159,207">
->>>>>>> master
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']"/>
-      </ownedElements>
-    </ownedDiagramElements>
-<<<<<<< HEAD
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_tR9WQBhnEeu74r7X1vovKw" name="Condition" tooltipText="" incomingEdges="_tS-p8BhnEeu74r7X1vovKw _tS_RABhnEeu74r7X1vovKw _tS_4EBhnEeu74r7X1vovKw _tTAfIBhnEeu74r7X1vovKw _tTCUUBhnEeu74r7X1vovKw _tTC7YBhnEeu74r7X1vovKw _tTMFUBhnEeu74r7X1vovKw _tTMFVBhnEeu74r7X1vovKw _tTNTcxhnEeu74r7X1vovKw" width="12" height="10">
-=======
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_tR9WQBhnEeu74r7X1vovKw" name="Condition" tooltipText="" outgoingEdges="_ODx-9gRpEe6qzcyNffzqYg _ODymBgRpEe6qzcyNffzqYg" incomingEdges="_ODttgwRpEe6qzcyNffzqYg _ODu7oARpEe6qzcyNffzqYg _ODzNFgRpEe6qzcyNffzqYg _ODz0JgRpEe6qzcyNffzqYg _OD2QYARpEe6qzcyNffzqYg _OD23cARpEe6qzcyNffzqYg _OD5TtgRpEe6qzcyNffzqYg _OD6h1gRpEe6qzcyNffzqYg _OD7v9gRpEe6qzcyNffzqYg" width="12" height="10">
->>>>>>> master
-      <target xmi:type="ecore:EClass" href="cbcmodel.ecore#//Condition"/>
-      <semanticElements xmi:type="ecore:EClass" href="cbcmodel.ecore#//Condition"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_tR9WQRhnEeu74r7X1vovKw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
-        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-<<<<<<< HEAD
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_tSp50BhnEeu74r7X1vovKw" name="name : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//Condition/name"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//Condition/name"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_tSp50RhnEeu74r7X1vovKw" labelAlignment="LEFT">
-=======
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_ODK68QRpEe6qzcyNffzqYg" name="name : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//Condition/name"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//Condition/name"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_ODLiAARpEe6qzcyNffzqYg" labelAlignment="LEFT">
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_ODLiAQRpEe6qzcyNffzqYg" name="modifiables : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//Condition/modifiables"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//Condition/modifiables"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_ODLiAgRpEe6qzcyNffzqYg" labelAlignment="LEFT">
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_ODMJEARpEe6qzcyNffzqYg" name="capsulesUsed : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//Condition/capsulesUsed"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//Condition/capsulesUsed"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_ODMJEQRpEe6qzcyNffzqYg" labelAlignment="LEFT">
->>>>>>> master
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-    </ownedDiagramElements>
-<<<<<<< HEAD
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_tR99UBhnEeu74r7X1vovKw" name="AbstractStatement" tooltipText="" outgoingEdges="_tS_4EBhnEeu74r7X1vovKw _tTAfIBhnEeu74r7X1vovKw _tTdyIBhnEeu74r7X1vovKw" incomingEdges="_tS80wBhnEeu74r7X1vovKw _tTBGMBhnEeu74r7X1vovKw _tTBtQBhnEeu74r7X1vovKw _tTDicBhnEeu74r7X1vovKw _tTK3MBhnEeu74r7X1vovKw _tTXEcBhnEeu74r7X1vovKw _tTYSkxhnEeu74r7X1vovKw _tTY5oxhnEeu74r7X1vovKw _tTaHxBhnEeu74r7X1vovKw _tTckABhnEeu74r7X1vovKw _tTdLEBhnEeu74r7X1vovKw _tTdyIBhnEeu74r7X1vovKw" width="12" height="10">
-=======
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_tR99UBhnEeu74r7X1vovKw" name="AbstractStatement" tooltipText="" outgoingEdges="_ODzNFgRpEe6qzcyNffzqYg _ODz0JgRpEe6qzcyNffzqYg _OEcGQARpEe6qzcyNffzqYg" incomingEdges="_ODsfYARpEe6qzcyNffzqYg _OD0bNgRpEe6qzcyNffzqYg _OD1CRgRpEe6qzcyNffzqYg _OD3egwRpEe6qzcyNffzqYg _OD4FkwRpEe6qzcyNffzqYg _OEOq4ARpEe6qzcyNffzqYg _OERHIwRpEe6qzcyNffzqYg _OERuNgRpEe6qzcyNffzqYg _OES8VgRpEe6qzcyNffzqYg _OEaREARpEe6qzcyNffzqYg _OEa4IARpEe6qzcyNffzqYg _OEcGQARpEe6qzcyNffzqYg" width="12" height="10">
->>>>>>> master
-      <target xmi:type="ecore:EClass" href="cbcmodel.ecore#//AbstractStatement"/>
-      <semanticElements xmi:type="ecore:EClass" href="cbcmodel.ecore#//AbstractStatement"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_tR99URhnEeu74r7X1vovKw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
-        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-<<<<<<< HEAD
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_tSqg4BhnEeu74r7X1vovKw" name="name : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//AbstractStatement/name"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//AbstractStatement/name"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_tSqg4RhnEeu74r7X1vovKw" labelAlignment="LEFT">
-=======
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_ODMwIARpEe6qzcyNffzqYg" name="name : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//AbstractStatement/name"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//AbstractStatement/name"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_ODMwIQRpEe6qzcyNffzqYg" labelAlignment="LEFT">
->>>>>>> master
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-<<<<<<< HEAD
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_tSrH8BhnEeu74r7X1vovKw" name="proven : EBoolean = false" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//AbstractStatement/proven"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//AbstractStatement/proven"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_tSrH8RhnEeu74r7X1vovKw" labelAlignment="LEFT">
-=======
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_ODNXMARpEe6qzcyNffzqYg" name="proven : EBoolean = false" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//AbstractStatement/proven"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//AbstractStatement/proven"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_ODNXMQRpEe6qzcyNffzqYg" labelAlignment="LEFT">
->>>>>>> master
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-<<<<<<< HEAD
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_tSrH8hhnEeu74r7X1vovKw" name="comment : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//AbstractStatement/comment"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//AbstractStatement/comment"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_tSrH8xhnEeu74r7X1vovKw" labelAlignment="LEFT">
-=======
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_ODNXMgRpEe6qzcyNffzqYg" name="comment : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//AbstractStatement/comment"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//AbstractStatement/comment"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_ODN-QARpEe6qzcyNffzqYg" labelAlignment="LEFT">
->>>>>>> master
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-<<<<<<< HEAD
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_tR-kYBhnEeu74r7X1vovKw" name="SkipStatement" tooltipText="" outgoingEdges="_tTXEcBhnEeu74r7X1vovKw" width="12" height="10">
-=======
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_ODN-QQRpEe6qzcyNffzqYg" name="id : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//AbstractStatement/id"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//AbstractStatement/id"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_ODOlUARpEe6qzcyNffzqYg" labelAlignment="LEFT" description="_otNxIARoEe6qzcyNffzqYg">
-          <labelFormat>bold</labelFormat>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_ODPMYARpEe6qzcyNffzqYg" name="tested : EBoolean = false" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//AbstractStatement/tested"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//AbstractStatement/tested"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_ODPzcARpEe6qzcyNffzqYg" labelAlignment="LEFT">
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_ODQagARpEe6qzcyNffzqYg" name="context : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//AbstractStatement/context"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//AbstractStatement/context"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_ODUE4ARpEe6qzcyNffzqYg" labelAlignment="LEFT">
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_ODUr8ARpEe6qzcyNffzqYg" name="typeableResult : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//AbstractStatement/typeableResult"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//AbstractStatement/typeableResult"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_ODUr8QRpEe6qzcyNffzqYg" labelAlignment="LEFT">
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_ODVTAARpEe6qzcyNffzqYg" name="typeableText : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//AbstractStatement/typeableText"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//AbstractStatement/typeableText"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_ODVTAQRpEe6qzcyNffzqYg" labelAlignment="LEFT">
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_ODV6EARpEe6qzcyNffzqYg" name="generateID()" tooltipText="generateID()">
-        <target xmi:type="ecore:EOperation" href="cbcmodel.ecore#//AbstractStatement/generateID"/>
-        <semanticElements xmi:type="ecore:EOperation" href="cbcmodel.ecore#//AbstractStatement/generateID"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_ODV6EQRpEe6qzcyNffzqYg" labelAlignment="LEFT">
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']"/>
-      </ownedElements>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_tR-kYBhnEeu74r7X1vovKw" name="SkipStatement" tooltipText="" outgoingEdges="_OEOq4ARpEe6qzcyNffzqYg" width="12" height="10">
->>>>>>> master
-      <target xmi:type="ecore:EClass" href="cbcmodel.ecore#//SkipStatement"/>
-      <semanticElements xmi:type="ecore:EClass" href="cbcmodel.ecore#//SkipStatement"/>
-      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
-      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
-      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_tR_LcBhnEeu74r7X1vovKw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
-        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-    </ownedDiagramElements>
-<<<<<<< HEAD
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_tR_LcRhnEeu74r7X1vovKw" name="CompositionStatement" tooltipText="" outgoingEdges="_tTBGMBhnEeu74r7X1vovKw _tTBtQBhnEeu74r7X1vovKw _tTCUUBhnEeu74r7X1vovKw _tTYSkxhnEeu74r7X1vovKw" width="12" height="10">
-=======
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_tR_LcRhnEeu74r7X1vovKw" name="CompositionStatement" tooltipText="" outgoingEdges="_OD0bNgRpEe6qzcyNffzqYg _OD1CRgRpEe6qzcyNffzqYg _OD2QYARpEe6qzcyNffzqYg _OERHIwRpEe6qzcyNffzqYg" width="12" height="10">
->>>>>>> master
-      <target xmi:type="ecore:EClass" href="cbcmodel.ecore#//CompositionStatement"/>
-      <semanticElements xmi:type="ecore:EClass" href="cbcmodel.ecore#//CompositionStatement"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_tR_LchhnEeu74r7X1vovKw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
-        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-    </ownedDiagramElements>
-<<<<<<< HEAD
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_tR_ygBhnEeu74r7X1vovKw" name="SelectionStatement" tooltipText="" outgoingEdges="_tTC7YBhnEeu74r7X1vovKw _tTDicBhnEeu74r7X1vovKw _tTY5oxhnEeu74r7X1vovKw" width="12" height="10">
-=======
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_tR_ygBhnEeu74r7X1vovKw" name="SelectionStatement" tooltipText="" outgoingEdges="_OD23cARpEe6qzcyNffzqYg _OD3egwRpEe6qzcyNffzqYg _OERuNgRpEe6qzcyNffzqYg" width="12" height="10">
->>>>>>> master
-      <target xmi:type="ecore:EClass" href="cbcmodel.ecore#//SelectionStatement"/>
-      <semanticElements xmi:type="ecore:EClass" href="cbcmodel.ecore#//SelectionStatement"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_tR_ygRhnEeu74r7X1vovKw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
-        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-<<<<<<< HEAD
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_tSsWEBhnEeu74r7X1vovKw" name="preProve : EBoolean = false" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//SelectionStatement/preProve"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//SelectionStatement/preProve"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_tSsWERhnEeu74r7X1vovKw" labelAlignment="LEFT">
-=======
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_ODWhIARpEe6qzcyNffzqYg" name="preProve : EBoolean = false" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//SelectionStatement/preProve"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//SelectionStatement/preProve"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_ODWhIQRpEe6qzcyNffzqYg" labelAlignment="LEFT">
->>>>>>> master
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-    </ownedDiagramElements>
-<<<<<<< HEAD
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_tSCOwBhnEeu74r7X1vovKw" name="Variant" tooltipText="" incomingEdges="_tTLeQxhnEeu74r7X1vovKw" width="12" height="10">
-=======
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_tSCOwBhnEeu74r7X1vovKw" name="Variant" tooltipText="" incomingEdges="_OD4spgRpEe6qzcyNffzqYg" width="12" height="10">
->>>>>>> master
-      <target xmi:type="ecore:EClass" href="cbcmodel.ecore#//Variant"/>
-      <semanticElements xmi:type="ecore:EClass" href="cbcmodel.ecore#//Variant"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_tSC10BhnEeu74r7X1vovKw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
-        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-<<<<<<< HEAD
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_tSuLQBhnEeu74r7X1vovKw" name="name : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//Variant/name"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//Variant/name"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_tSuLQRhnEeu74r7X1vovKw" labelAlignment="LEFT">
-=======
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_ODXIMARpEe6qzcyNffzqYg" name="name : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//Variant/name"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//Variant/name"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_ODXvQARpEe6qzcyNffzqYg" labelAlignment="LEFT">
->>>>>>> master
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-    </ownedDiagramElements>
-<<<<<<< HEAD
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_tSC10RhnEeu74r7X1vovKw" name="ReturnStatement" tooltipText="" outgoingEdges="_tTaHxBhnEeu74r7X1vovKw" width="12" height="10">
-=======
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_tSC10RhnEeu74r7X1vovKw" name="ReturnStatement" tooltipText="" outgoingEdges="_OES8VgRpEe6qzcyNffzqYg" width="12" height="10">
->>>>>>> master
-      <target xmi:type="ecore:EClass" href="cbcmodel.ecore#//ReturnStatement"/>
-      <semanticElements xmi:type="ecore:EClass" href="cbcmodel.ecore#//ReturnStatement"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_tSDc4BhnEeu74r7X1vovKw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
-        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-    </ownedDiagramElements>
-<<<<<<< HEAD
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_tSF5IBhnEeu74r7X1vovKw" name="SmallRepetitionStatement" tooltipText="" outgoingEdges="_tTK3MBhnEeu74r7X1vovKw _tTLeQxhnEeu74r7X1vovKw _tTMFUBhnEeu74r7X1vovKw _tTMFVBhnEeu74r7X1vovKw _tTckABhnEeu74r7X1vovKw" width="12" height="10">
-=======
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_tSF5IBhnEeu74r7X1vovKw" name="SmallRepetitionStatement" tooltipText="" outgoingEdges="_OD4FkwRpEe6qzcyNffzqYg _OD4spgRpEe6qzcyNffzqYg _OD5TtgRpEe6qzcyNffzqYg _OD6h1gRpEe6qzcyNffzqYg _OEaREARpEe6qzcyNffzqYg" width="12" height="10">
->>>>>>> master
-      <target xmi:type="ecore:EClass" href="cbcmodel.ecore#//SmallRepetitionStatement"/>
-      <semanticElements xmi:type="ecore:EClass" href="cbcmodel.ecore#//SmallRepetitionStatement"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_tSF5IRhnEeu74r7X1vovKw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
-        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-<<<<<<< HEAD
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_tSwngBhnEeu74r7X1vovKw" name="variantProven : EBoolean = false" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//SmallRepetitionStatement/variantProven"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//SmallRepetitionStatement/variantProven"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_tSwngRhnEeu74r7X1vovKw" labelAlignment="LEFT">
-=======
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_ODXvQQRpEe6qzcyNffzqYg" name="variantProven : EBoolean = false" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//SmallRepetitionStatement/variantProven"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//SmallRepetitionStatement/variantProven"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_ODYWUARpEe6qzcyNffzqYg" labelAlignment="LEFT">
->>>>>>> master
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-<<<<<<< HEAD
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_tSwnghhnEeu74r7X1vovKw" name="preProven : EBoolean = false" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//SmallRepetitionStatement/preProven"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//SmallRepetitionStatement/preProven"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_tSxOkBhnEeu74r7X1vovKw" labelAlignment="LEFT">
-=======
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_ODYWUQRpEe6qzcyNffzqYg" name="preProven : EBoolean = false" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//SmallRepetitionStatement/preProven"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//SmallRepetitionStatement/preProven"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_ODY9YARpEe6qzcyNffzqYg" labelAlignment="LEFT">
->>>>>>> master
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-<<<<<<< HEAD
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_tSxOkRhnEeu74r7X1vovKw" name="postProven : EBoolean = false" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//SmallRepetitionStatement/postProven"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//SmallRepetitionStatement/postProven"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_tSxOkhhnEeu74r7X1vovKw" labelAlignment="LEFT">
-=======
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_ODY9YQRpEe6qzcyNffzqYg" name="postProven : EBoolean = false" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//SmallRepetitionStatement/postProven"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//SmallRepetitionStatement/postProven"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_ODY9YgRpEe6qzcyNffzqYg" labelAlignment="LEFT">
->>>>>>> master
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-    </ownedDiagramElements>
-<<<<<<< HEAD
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_tSGgMBhnEeu74r7X1vovKw" name="JavaVariables" tooltipText="" outgoingEdges="_tTMsYxhnEeu74r7X1vovKw" incomingEdges="_tTQ90BhnEeu74r7X1vovKw" width="12" height="10">
-=======
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_tSGgMBhnEeu74r7X1vovKw" name="JavaVariables" tooltipText="" outgoingEdges="_OD7I5gRpEe6qzcyNffzqYg" incomingEdges="_OD-MMwRpEe6qzcyNffzqYg" width="12" height="10">
->>>>>>> master
-      <target xmi:type="ecore:EClass" href="cbcmodel.ecore#//JavaVariables"/>
-      <semanticElements xmi:type="ecore:EClass" href="cbcmodel.ecore#//JavaVariables"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_ywnyoLluEeuLqap_e83Fow" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
-        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-<<<<<<< HEAD
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_NNK0IMksEeurpJGqlvHU8A" name=" /fields : Field" tooltipText="">
-        <target xmi:type="ecore:EReference" href="cbcmodel.ecore#//JavaVariables/fields"/>
-        <semanticElements xmi:type="ecore:EReference" href="cbcmodel.ecore#//JavaVariables/fields"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_NNK0IsksEeurpJGqlvHU8A" labelColor="39,76,114" labelAlignment="LEFT" description="_NNK0IcksEeurpJGqlvHU8A" color="114,159,207"/>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']"/>
-      </ownedElements>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_tSHuUBhnEeu74r7X1vovKw" name="JavaVariable" tooltipText="" incomingEdges="_tTMsYxhnEeu74r7X1vovKw" width="12" height="10">
-=======
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_ODZkcARpEe6qzcyNffzqYg" name=" fields : Field" tooltipText="">
-        <target xmi:type="ecore:EReference" href="cbcmodel.ecore#//JavaVariables/fields"/>
-        <semanticElements xmi:type="ecore:EReference" href="cbcmodel.ecore#//JavaVariables/fields"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_ODZkcQRpEe6qzcyNffzqYg" labelAlignment="LEFT" color="114,159,207">
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']"/>
-      </ownedElements>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_ODaLgARpEe6qzcyNffzqYg" name=" params : Parameter" tooltipText="">
-        <target xmi:type="ecore:EReference" href="cbcmodel.ecore#//JavaVariables/params"/>
-        <semanticElements xmi:type="ecore:EReference" href="cbcmodel.ecore#//JavaVariables/params"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_ODaLgQRpEe6qzcyNffzqYg" labelAlignment="LEFT" color="114,159,207">
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']"/>
-      </ownedElements>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_tSHuUBhnEeu74r7X1vovKw" name="JavaVariable" tooltipText="" incomingEdges="_OD7I5gRpEe6qzcyNffzqYg" width="12" height="10">
->>>>>>> master
-      <target xmi:type="ecore:EClass" href="cbcmodel.ecore#//JavaVariable"/>
-      <semanticElements xmi:type="ecore:EClass" href="cbcmodel.ecore#//JavaVariable"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_tSHuURhnEeu74r7X1vovKw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
-        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-<<<<<<< HEAD
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_tSx1oBhnEeu74r7X1vovKw" name="name : EString = int a" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//JavaVariable/name"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//JavaVariable/name"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_tSx1oRhnEeu74r7X1vovKw" labelAlignment="LEFT">
-=======
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_ODcAsARpEe6qzcyNffzqYg" name="name : EString = int a" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//JavaVariable/name"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//JavaVariable/name"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_ODcnwARpEe6qzcyNffzqYg" labelAlignment="LEFT">
->>>>>>> master
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-<<<<<<< HEAD
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_tSycsBhnEeu74r7X1vovKw" name="kind : VariableKind = LOCAL" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//JavaVariable/kind"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//JavaVariable/kind"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_tSycsRhnEeu74r7X1vovKw" labelAlignment="LEFT">
-=======
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_ODcnwQRpEe6qzcyNffzqYg" name="kind : VariableKind = LOCAL" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//JavaVariable/kind"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//JavaVariable/kind"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_ODdO0ARpEe6qzcyNffzqYg" labelAlignment="LEFT">
->>>>>>> master
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-<<<<<<< HEAD
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_tSycshhnEeu74r7X1vovKw" name="/displayedName : EString = kind + &quot; &quot; + name" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//JavaVariable/displayedName"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//JavaVariable/displayedName"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_V6QNUDlTEeuTsePhuAzSNA" labelColor="39,76,114" labelAlignment="LEFT" description="_V6PmQDlTEeuTsePhuAzSNA"/>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_tSI8cBhnEeu74r7X1vovKw" name="GlobalConditions" tooltipText="" outgoingEdges="_tTNTcxhnEeu74r7X1vovKw" incomingEdges="_tTPvsBhnEeu74r7X1vovKw" width="12" height="10">
-=======
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_ODdO0QRpEe6qzcyNffzqYg" name="confidentiality : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//JavaVariable/confidentiality"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//JavaVariable/confidentiality"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_ODdO0gRpEe6qzcyNffzqYg" labelAlignment="LEFT">
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_ODd14ARpEe6qzcyNffzqYg" name="modifier : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//JavaVariable/modifier"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//JavaVariable/modifier"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_ODd14QRpEe6qzcyNffzqYg" labelAlignment="LEFT">
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_ODd14gRpEe6qzcyNffzqYg" name="/displayedName : EString = kind + &quot; &quot; + name" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//JavaVariable/displayedName"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//JavaVariable/displayedName"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_ODec8ARpEe6qzcyNffzqYg" labelColor="39,76,114" labelAlignment="LEFT" description="_V6PmQDlTEeuTsePhuAzSNA"/>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_tSI8cBhnEeu74r7X1vovKw" name="GlobalConditions" tooltipText="" outgoingEdges="_OD7v9gRpEe6qzcyNffzqYg" incomingEdges="_OD8-FgRpEe6qzcyNffzqYg" width="12" height="10">
->>>>>>> master
-      <target xmi:type="ecore:EClass" href="cbcmodel.ecore#//GlobalConditions"/>
-      <semanticElements xmi:type="ecore:EClass" href="cbcmodel.ecore#//GlobalConditions"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_r-I54LMmEeuqcozV6t58rA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
-        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-    </ownedDiagramElements>
-<<<<<<< HEAD
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_tSKKkBhnEeu74r7X1vovKw" name="Renaming" tooltipText="" outgoingEdges="_tTN6gxhnEeu74r7X1vovKw" incomingEdges="_tTRk4BhnEeu74r7X1vovKw" width="12" height="10">
-=======
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_tSKKkBhnEeu74r7X1vovKw" name="Renaming" tooltipText="" outgoingEdges="_OD8XBgRpEe6qzcyNffzqYg" incomingEdges="_OEMOoARpEe6qzcyNffzqYg" width="12" height="10">
->>>>>>> master
-      <target xmi:type="ecore:EClass" href="cbcmodel.ecore#//Renaming"/>
-      <semanticElements xmi:type="ecore:EClass" href="cbcmodel.ecore#//Renaming"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_tSKKkRhnEeu74r7X1vovKw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
-        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-    </ownedDiagramElements>
-<<<<<<< HEAD
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_tSKxoBhnEeu74r7X1vovKw" name="Rename" tooltipText="" incomingEdges="_tTN6gxhnEeu74r7X1vovKw" width="12" height="10">
-=======
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_tSKxoBhnEeu74r7X1vovKw" name="Rename" tooltipText="" incomingEdges="_OD8XBgRpEe6qzcyNffzqYg" width="12" height="10">
->>>>>>> master
-      <target xmi:type="ecore:EClass" href="cbcmodel.ecore#//Rename"/>
-      <semanticElements xmi:type="ecore:EClass" href="cbcmodel.ecore#//Rename"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_tSLYsBhnEeu74r7X1vovKw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
-        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-<<<<<<< HEAD
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_tSzq0BhnEeu74r7X1vovKw" name="type : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//Rename/type"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//Rename/type"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_tSzq0RhnEeu74r7X1vovKw" labelAlignment="LEFT">
-=======
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_ODg5MARpEe6qzcyNffzqYg" name="type : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//Rename/type"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//Rename/type"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_ODhgQARpEe6qzcyNffzqYg" labelAlignment="LEFT">
->>>>>>> master
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-<<<<<<< HEAD
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_tS0R4BhnEeu74r7X1vovKw" name="function : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//Rename/function"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//Rename/function"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_tS0R4RhnEeu74r7X1vovKw" labelAlignment="LEFT">
-=======
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_ODhgQQRpEe6qzcyNffzqYg" name="function : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//Rename/function"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//Rename/function"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_ODiHUARpEe6qzcyNffzqYg" labelAlignment="LEFT">
->>>>>>> master
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-<<<<<<< HEAD
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_tS0R4hhnEeu74r7X1vovKw" name="newName : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//Rename/newName"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//Rename/newName"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_tS0R4xhnEeu74r7X1vovKw" labelAlignment="LEFT">
-=======
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_ODiHUQRpEe6qzcyNffzqYg" name="newName : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//Rename/newName"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//Rename/newName"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_ODiHUgRpEe6qzcyNffzqYg" labelAlignment="LEFT">
->>>>>>> master
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-    </ownedDiagramElements>
-<<<<<<< HEAD
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_tSL_wBhnEeu74r7X1vovKw" name="CbCProblem" tooltipText="" outgoingEdges="_tTPvsBhnEeu74r7X1vovKw _tTQWwBhnEeu74r7X1vovKw _tTQ90BhnEeu74r7X1vovKw _tTRk4BhnEeu74r7X1vovKw _tTSzABhnEeu74r7X1vovKw _tTTaEBhnEeu74r7X1vovKw" width="12" height="10">
-=======
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_tSL_wBhnEeu74r7X1vovKw" name="CbCProblem" tooltipText="" outgoingEdges="_OD8-FgRpEe6qzcyNffzqYg _OD9lIwRpEe6qzcyNffzqYg _OD-MMwRpEe6qzcyNffzqYg _OEMOoARpEe6qzcyNffzqYg" width="12" height="10">
->>>>>>> master
-      <target xmi:type="ecore:EClass" href="cbcmodel.ecore#//CbCProblem"/>
-      <semanticElements xmi:type="ecore:EClass" href="cbcmodel.ecore#//CbCProblem"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_tSMm0BhnEeu74r7X1vovKw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
-        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-    </ownedDiagramElements>
-<<<<<<< HEAD
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_tSNN4BhnEeu74r7X1vovKw" name="StrengthWeakStatement" tooltipText="" outgoingEdges="_tTdLEBhnEeu74r7X1vovKw" width="12" height="10">
-=======
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_tSNN4BhnEeu74r7X1vovKw" name="StrengthWeakStatement" tooltipText="" outgoingEdges="_OEa4IARpEe6qzcyNffzqYg" width="12" height="10">
->>>>>>> master
-      <target xmi:type="ecore:EClass" href="cbcmodel.ecore#//StrengthWeakStatement"/>
-      <semanticElements xmi:type="ecore:EClass" href="cbcmodel.ecore#//StrengthWeakStatement"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_tSNN4RhnEeu74r7X1vovKw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
-        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_tSOcABhnEeu74r7X1vovKw" name="VariableKind" tooltipText="" width="12" height="10">
-      <target xmi:type="ecore:EEnum" href="cbcmodel.ecore#//VariableKind"/>
-      <semanticElements xmi:type="ecore:EEnum" href="cbcmodel.ecore#//VariableKind"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_tSOcARhnEeu74r7X1vovKw" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="221,236,202">
-        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@style"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']"/>
-<<<<<<< HEAD
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_tS38QBhnEeu74r7X1vovKw" name="LOCAL" tooltipText="">
-        <target xmi:type="ecore:EEnumLiteral" href="cbcmodel.ecore#//VariableKind/LOCAL"/>
-        <semanticElements xmi:type="ecore:EEnumLiteral" href="cbcmodel.ecore#//VariableKind/LOCAL"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_tS38QRhnEeu74r7X1vovKw" labelAlignment="LEFT">
-=======
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_ODnm4ARpEe6qzcyNffzqYg" name="LOCAL" tooltipText="">
-        <target xmi:type="ecore:EEnumLiteral" href="cbcmodel.ecore#//VariableKind/LOCAL"/>
-        <semanticElements xmi:type="ecore:EEnumLiteral" href="cbcmodel.ecore#//VariableKind/LOCAL"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_ODnm4QRpEe6qzcyNffzqYg" labelAlignment="LEFT">
->>>>>>> master
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>
-      </ownedElements>
-<<<<<<< HEAD
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_tS4jUBhnEeu74r7X1vovKw" name="PARAM" tooltipText="">
-        <target xmi:type="ecore:EEnumLiteral" href="cbcmodel.ecore#//VariableKind/PARAM"/>
-        <semanticElements xmi:type="ecore:EEnumLiteral" href="cbcmodel.ecore#//VariableKind/PARAM"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_tS4jURhnEeu74r7X1vovKw" labelAlignment="LEFT">
-=======
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_ODoN8ARpEe6qzcyNffzqYg" name="PARAM" tooltipText="">
-        <target xmi:type="ecore:EEnumLiteral" href="cbcmodel.ecore#//VariableKind/PARAM"/>
-        <semanticElements xmi:type="ecore:EEnumLiteral" href="cbcmodel.ecore#//VariableKind/PARAM"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_ODoN8QRpEe6qzcyNffzqYg" labelAlignment="LEFT">
->>>>>>> master
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>
-      </ownedElements>
-<<<<<<< HEAD
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_tS4jUhhnEeu74r7X1vovKw" name="RETURN" tooltipText="">
-        <target xmi:type="ecore:EEnumLiteral" href="cbcmodel.ecore#//VariableKind/RETURN"/>
-        <semanticElements xmi:type="ecore:EEnumLiteral" href="cbcmodel.ecore#//VariableKind/RETURN"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_tS4jUxhnEeu74r7X1vovKw" labelAlignment="LEFT">
-=======
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_ODoN8gRpEe6qzcyNffzqYg" name="RETURN" tooltipText="">
-        <target xmi:type="ecore:EEnumLiteral" href="cbcmodel.ecore#//VariableKind/RETURN"/>
-        <semanticElements xmi:type="ecore:EEnumLiteral" href="cbcmodel.ecore#//VariableKind/RETURN"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_ODoN8wRpEe6qzcyNffzqYg" labelAlignment="LEFT">
->>>>>>> master
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>
-      </ownedElements>
-<<<<<<< HEAD
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_tS5KYBhnEeu74r7X1vovKw" name="GLOBAL" tooltipText="">
-        <target xmi:type="ecore:EEnumLiteral" href="cbcmodel.ecore#//VariableKind/GLOBAL"/>
-        <semanticElements xmi:type="ecore:EEnumLiteral" href="cbcmodel.ecore#//VariableKind/GLOBAL"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_tS5KYRhnEeu74r7X1vovKw" labelAlignment="LEFT">
-=======
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_ODoN9ARpEe6qzcyNffzqYg" name="GLOBAL" tooltipText="">
-        <target xmi:type="ecore:EEnumLiteral" href="cbcmodel.ecore#//VariableKind/GLOBAL"/>
-        <semanticElements xmi:type="ecore:EEnumLiteral" href="cbcmodel.ecore#//VariableKind/GLOBAL"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_ODo1AARpEe6qzcyNffzqYg" labelAlignment="LEFT">
->>>>>>> master
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>
-      </ownedElements>
-<<<<<<< HEAD
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_tS5KYhhnEeu74r7X1vovKw" name="GLOBAL_PARAM" tooltipText="">
-        <target xmi:type="ecore:EEnumLiteral" href="cbcmodel.ecore#//VariableKind/GLOBAL_PARAM"/>
-        <semanticElements xmi:type="ecore:EEnumLiteral" href="cbcmodel.ecore#//VariableKind/GLOBAL_PARAM"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_tS5xcBhnEeu74r7X1vovKw" labelAlignment="LEFT">
-=======
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_ODo1AQRpEe6qzcyNffzqYg" name="GLOBAL_PARAM" tooltipText="">
-        <target xmi:type="ecore:EEnumLiteral" href="cbcmodel.ecore#//VariableKind/GLOBAL_PARAM"/>
-        <semanticElements xmi:type="ecore:EEnumLiteral" href="cbcmodel.ecore#//VariableKind/GLOBAL_PARAM"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_ODo1AgRpEe6qzcyNffzqYg" labelAlignment="LEFT">
->>>>>>> master
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>
-      </ownedElements>
-<<<<<<< HEAD
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_tS5xcRhnEeu74r7X1vovKw" name="RETURNPARAM" tooltipText="">
-        <target xmi:type="ecore:EEnumLiteral" href="cbcmodel.ecore#//VariableKind/RETURNPARAM"/>
-        <semanticElements xmi:type="ecore:EEnumLiteral" href="cbcmodel.ecore#//VariableKind/RETURNPARAM"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_tS5xchhnEeu74r7X1vovKw" labelAlignment="LEFT">
-=======
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_ODo1AwRpEe6qzcyNffzqYg" name="RETURNPARAM" tooltipText="">
-        <target xmi:type="ecore:EEnumLiteral" href="cbcmodel.ecore#//VariableKind/RETURNPARAM"/>
-        <semanticElements xmi:type="ecore:EEnumLiteral" href="cbcmodel.ecore#//VariableKind/RETURNPARAM"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_ODo1BARpEe6qzcyNffzqYg" labelAlignment="LEFT">
->>>>>>> master
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>
-      </ownedElements>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_tSPDEBhnEeu74r7X1vovKw" name="CompositionTechnique" tooltipText="" width="12" height="10">
-      <target xmi:type="ecore:EEnum" href="cbcmodel.ecore#//CompositionTechnique"/>
-      <semanticElements xmi:type="ecore:EEnum" href="cbcmodel.ecore#//CompositionTechnique"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_tSPqIBhnEeu74r7X1vovKw" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="221,236,202">
-        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@style"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']"/>
-<<<<<<< HEAD
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_tS6YgBhnEeu74r7X1vovKw" name="CONTRACT_OVERRIDING" tooltipText="">
-        <target xmi:type="ecore:EEnumLiteral" href="cbcmodel.ecore#//CompositionTechnique/CONTRACT_OVERRIDING"/>
-        <semanticElements xmi:type="ecore:EEnumLiteral" href="cbcmodel.ecore#//CompositionTechnique/CONTRACT_OVERRIDING"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_tS6YgRhnEeu74r7X1vovKw" labelAlignment="LEFT">
-=======
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_ODpcEARpEe6qzcyNffzqYg" name="CONTRACT_OVERRIDING" tooltipText="">
-        <target xmi:type="ecore:EEnumLiteral" href="cbcmodel.ecore#//CompositionTechnique/CONTRACT_OVERRIDING"/>
-        <semanticElements xmi:type="ecore:EEnumLiteral" href="cbcmodel.ecore#//CompositionTechnique/CONTRACT_OVERRIDING"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_ODpcEQRpEe6qzcyNffzqYg" labelAlignment="LEFT">
->>>>>>> master
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>
-      </ownedElements>
-<<<<<<< HEAD
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_tS6YghhnEeu74r7X1vovKw" name="EXPLICIT_CONTRACTING" tooltipText="">
-        <target xmi:type="ecore:EEnumLiteral" href="cbcmodel.ecore#//CompositionTechnique/EXPLICIT_CONTRACTING"/>
-        <semanticElements xmi:type="ecore:EEnumLiteral" href="cbcmodel.ecore#//CompositionTechnique/EXPLICIT_CONTRACTING"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_tS6YgxhnEeu74r7X1vovKw" labelAlignment="LEFT">
-=======
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_ODpcEgRpEe6qzcyNffzqYg" name="EXPLICIT_CONTRACTING" tooltipText="">
-        <target xmi:type="ecore:EEnumLiteral" href="cbcmodel.ecore#//CompositionTechnique/EXPLICIT_CONTRACTING"/>
-        <semanticElements xmi:type="ecore:EEnumLiteral" href="cbcmodel.ecore#//CompositionTechnique/EXPLICIT_CONTRACTING"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_ODqDIARpEe6qzcyNffzqYg" labelAlignment="LEFT">
->>>>>>> master
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>
-      </ownedElements>
-<<<<<<< HEAD
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_tS6_kBhnEeu74r7X1vovKw" name="CONJUNCTIVE_CONTRACTING" tooltipText="">
-        <target xmi:type="ecore:EEnumLiteral" href="cbcmodel.ecore#//CompositionTechnique/CONJUNCTIVE_CONTRACTING"/>
-        <semanticElements xmi:type="ecore:EEnumLiteral" href="cbcmodel.ecore#//CompositionTechnique/CONJUNCTIVE_CONTRACTING"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_tS6_kRhnEeu74r7X1vovKw" labelAlignment="LEFT">
-=======
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_ODqqMARpEe6qzcyNffzqYg" name="CONJUNCTIVE_CONTRACTING" tooltipText="">
-        <target xmi:type="ecore:EEnumLiteral" href="cbcmodel.ecore#//CompositionTechnique/CONJUNCTIVE_CONTRACTING"/>
-        <semanticElements xmi:type="ecore:EEnumLiteral" href="cbcmodel.ecore#//CompositionTechnique/CONJUNCTIVE_CONTRACTING"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_ODqqMQRpEe6qzcyNffzqYg" labelAlignment="LEFT">
->>>>>>> master
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>
-      </ownedElements>
-    </ownedDiagramElements>
-<<<<<<< HEAD
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_tS80wBhnEeu74r7X1vovKw" name="[1..1] statement" sourceNode="_tR6S8BhnEeu74r7X1vovKw" targetNode="_tR99UBhnEeu74r7X1vovKw">
-      <target xmi:type="ecore:EReference" href="cbcmodel.ecore#//CbCFormula/statement"/>
-      <semanticElements xmi:type="ecore:EReference" href="cbcmodel.ecore#//CbCFormula/statement"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_tS-C4xhnEeu74r7X1vovKw" description="_tS-C4BhnEeu74r7X1vovKw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_tS-C5BhnEeu74r7X1vovKw" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-          <labelFormat>bold</labelFormat>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_tS-C5RhnEeu74r7X1vovKw" showIcon="false" labelColor="39,76,114">
-=======
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_8Npq4ARoEe6qzcyNffzqYg" name="AtType" tooltipText="" incomingEdges="_ODww0wRpEe6qzcyNffzqYg _OEM1sARpEe6qzcyNffzqYg" width="12" height="10">
-      <target xmi:type="ecore:EClass" href="cbcmodel.ecore#//AtType"/>
-      <semanticElements xmi:type="ecore:EClass" href="cbcmodel.ecore#//AtType"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_8NqR8ARoEe6qzcyNffzqYg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
-        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_ODiuYARpEe6qzcyNffzqYg" name="name : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//AtType/name"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//AtType/name"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_ODjVcARpEe6qzcyNffzqYg" labelAlignment="LEFT">
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_8NrgEARoEe6qzcyNffzqYg" name="AtTypesToVarsMap" tooltipText="" outgoingEdges="_OEM1sARpEe6qzcyNffzqYg" incomingEdges="_ODymBgRpEe6qzcyNffzqYg" width="12" height="10">
-      <target xmi:type="ecore:EClass" href="cbcmodel.ecore#//AtTypesToVarsMap"/>
-      <semanticElements xmi:type="ecore:EClass" href="cbcmodel.ecore#//AtTypesToVarsMap"/>
-      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
-      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
-      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_8NsHIARoEe6qzcyNffzqYg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
-        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_ODjVcQRpEe6qzcyNffzqYg" name="key : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//AtTypesToVarsMap/key"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//AtTypesToVarsMap/key"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_ODj8gARpEe6qzcyNffzqYg" labelAlignment="LEFT">
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_8NsuMQRoEe6qzcyNffzqYg" name="ConfToVarsMap" tooltipText="" outgoingEdges="_OEM1twRpEe6qzcyNffzqYg" incomingEdges="_ODx-9gRpEe6qzcyNffzqYg" width="12" height="10">
-      <target xmi:type="ecore:EClass" href="cbcmodel.ecore#//ConfToVarsMap"/>
-      <semanticElements xmi:type="ecore:EClass" href="cbcmodel.ecore#//ConfToVarsMap"/>
-      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
-      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
-      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_8NtVQARoEe6qzcyNffzqYg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
-        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_ODj8gQRpEe6qzcyNffzqYg" name="key : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//ConfToVarsMap/key"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//ConfToVarsMap/key"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_ODkjkARpEe6qzcyNffzqYg" labelAlignment="LEFT">
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_8Nt8UARoEe6qzcyNffzqYg" name="Security" tooltipText="" incomingEdges="_ODxX4wRpEe6qzcyNffzqYg _OEM1twRpEe6qzcyNffzqYg" width="12" height="10">
-      <target xmi:type="ecore:EClass" href="cbcmodel.ecore#//Security"/>
-      <semanticElements xmi:type="ecore:EClass" href="cbcmodel.ecore#//Security"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_8NujYARoEe6qzcyNffzqYg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
-        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_ODlKoARpEe6qzcyNffzqYg" name="level : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//Security/level"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//Security/level"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_ODlxsARpEe6qzcyNffzqYg" labelAlignment="LEFT">
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_ODmYwARpEe6qzcyNffzqYg" name="mutationModifier : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//Security/mutationModifier"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="cbcmodel.ecore#//Security/mutationModifier"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_ODmYwQRpEe6qzcyNffzqYg" labelAlignment="LEFT">
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_ODsfYARpEe6qzcyNffzqYg" name="[1..1] statement" sourceNode="_tR6S8BhnEeu74r7X1vovKw" targetNode="_tR99UBhnEeu74r7X1vovKw">
-      <target xmi:type="ecore:EReference" href="cbcmodel.ecore#//CbCFormula/statement"/>
-      <semanticElements xmi:type="ecore:EReference" href="cbcmodel.ecore#//CbCFormula/statement"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_ODtGcARpEe6qzcyNffzqYg" description="_tS-C4BhnEeu74r7X1vovKw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_ODtGcgRpEe6qzcyNffzqYg" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-          <labelFormat>bold</labelFormat>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_ODtGcQRpEe6qzcyNffzqYg" showIcon="false" labelColor="39,76,114">
->>>>>>> master
-          <customFeatures>labelSize</customFeatures>
-        </endLabelStyle>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
-    </ownedDiagramElements>
-<<<<<<< HEAD
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_tS-p8BhnEeu74r7X1vovKw" name="[1..1] preCondition" sourceNode="_tR6S8BhnEeu74r7X1vovKw" targetNode="_tR9WQBhnEeu74r7X1vovKw">
-      <target xmi:type="ecore:EReference" href="cbcmodel.ecore#//CbCFormula/preCondition"/>
-      <semanticElements xmi:type="ecore:EReference" href="cbcmodel.ecore#//CbCFormula/preCondition"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_tS-p8RhnEeu74r7X1vovKw" description="_tS-C4BhnEeu74r7X1vovKw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_tS-p8hhnEeu74r7X1vovKw" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-          <labelFormat>bold</labelFormat>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_tS-p8xhnEeu74r7X1vovKw" showIcon="false" labelColor="39,76,114">
-=======
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_ODttgwRpEe6qzcyNffzqYg" name="[1..1] preCondition" sourceNode="_tR6S8BhnEeu74r7X1vovKw" targetNode="_tR9WQBhnEeu74r7X1vovKw">
-      <target xmi:type="ecore:EReference" href="cbcmodel.ecore#//CbCFormula/preCondition"/>
-      <semanticElements xmi:type="ecore:EReference" href="cbcmodel.ecore#//CbCFormula/preCondition"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_ODuUkARpEe6qzcyNffzqYg" description="_tS-C4BhnEeu74r7X1vovKw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_ODuUkgRpEe6qzcyNffzqYg" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-          <labelFormat>bold</labelFormat>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_ODuUkQRpEe6qzcyNffzqYg" showIcon="false" labelColor="39,76,114">
->>>>>>> master
-          <customFeatures>labelSize</customFeatures>
-        </endLabelStyle>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
-    </ownedDiagramElements>
-<<<<<<< HEAD
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_tS_RABhnEeu74r7X1vovKw" name="[1..1] postCondition" sourceNode="_tR6S8BhnEeu74r7X1vovKw" targetNode="_tR9WQBhnEeu74r7X1vovKw">
-      <target xmi:type="ecore:EReference" href="cbcmodel.ecore#//CbCFormula/postCondition"/>
-      <semanticElements xmi:type="ecore:EReference" href="cbcmodel.ecore#//CbCFormula/postCondition"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_tS_RARhnEeu74r7X1vovKw" description="_tS-C4BhnEeu74r7X1vovKw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_tS_RAhhnEeu74r7X1vovKw" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-          <labelFormat>bold</labelFormat>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_tS_RAxhnEeu74r7X1vovKw" showIcon="false" labelColor="39,76,114">
-=======
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_ODu7oARpEe6qzcyNffzqYg" name="[1..1] postCondition" sourceNode="_tR6S8BhnEeu74r7X1vovKw" targetNode="_tR9WQBhnEeu74r7X1vovKw">
-      <target xmi:type="ecore:EReference" href="cbcmodel.ecore#//CbCFormula/postCondition"/>
-      <semanticElements xmi:type="ecore:EReference" href="cbcmodel.ecore#//CbCFormula/postCondition"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_ODwJwARpEe6qzcyNffzqYg" description="_tS-C4BhnEeu74r7X1vovKw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_ODwJwgRpEe6qzcyNffzqYg" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-          <labelFormat>bold</labelFormat>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_ODwJwQRpEe6qzcyNffzqYg" showIcon="false" labelColor="39,76,114">
->>>>>>> master
-          <customFeatures>labelSize</customFeatures>
-        </endLabelStyle>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
-    </ownedDiagramElements>
-<<<<<<< HEAD
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_tS_4EBhnEeu74r7X1vovKw" name="[0..1] postCondition" sourceNode="_tR99UBhnEeu74r7X1vovKw" targetNode="_tR9WQBhnEeu74r7X1vovKw">
-      <target xmi:type="ecore:EReference" href="cbcmodel.ecore#//AbstractStatement/postCondition"/>
-      <semanticElements xmi:type="ecore:EReference" href="cbcmodel.ecore#//AbstractStatement/postCondition"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_tS_4FBhnEeu74r7X1vovKw" description="_tS_4ERhnEeu74r7X1vovKw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_tS_4FRhnEeu74r7X1vovKw" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_tS_4FhhnEeu74r7X1vovKw" showIcon="false" labelColor="39,76,114">
-=======
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_ODww0wRpEe6qzcyNffzqYg" name="[0..*] atType" sourceNode="_tR6S8BhnEeu74r7X1vovKw" targetNode="_8Npq4ARoEe6qzcyNffzqYg">
-      <target xmi:type="ecore:EReference" href="cbcmodel.ecore#//CbCFormula/atType"/>
-      <semanticElements xmi:type="ecore:EReference" href="cbcmodel.ecore#//CbCFormula/atType"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_ODww1ARpEe6qzcyNffzqYg" description="_tS_4ERhnEeu74r7X1vovKw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_ODww1gRpEe6qzcyNffzqYg" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_ODww1QRpEe6qzcyNffzqYg" showIcon="false" labelColor="39,76,114">
-          <customFeatures>labelSize</customFeatures>
-        </endLabelStyle>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_ODxX4wRpEe6qzcyNffzqYg" name="[0..*] security" sourceNode="_tR6S8BhnEeu74r7X1vovKw" targetNode="_8Nt8UARoEe6qzcyNffzqYg">
-      <target xmi:type="ecore:EReference" href="cbcmodel.ecore#//CbCFormula/security"/>
-      <semanticElements xmi:type="ecore:EReference" href="cbcmodel.ecore#//CbCFormula/security"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_ODx-8ARpEe6qzcyNffzqYg" description="_tS_4ERhnEeu74r7X1vovKw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_ODx-8gRpEe6qzcyNffzqYg" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_ODx-8QRpEe6qzcyNffzqYg" showIcon="false" labelColor="39,76,114">
-          <customFeatures>labelSize</customFeatures>
-        </endLabelStyle>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_ODx-9gRpEe6qzcyNffzqYg" name="[0..*] confToVarsMap" sourceNode="_tR9WQBhnEeu74r7X1vovKw" targetNode="_8NsuMQRoEe6qzcyNffzqYg">
-      <target xmi:type="ecore:EReference" href="cbcmodel.ecore#//Condition/confToVarsMap"/>
-      <semanticElements xmi:type="ecore:EReference" href="cbcmodel.ecore#//Condition/confToVarsMap"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_ODymAARpEe6qzcyNffzqYg" description="_tS_4ERhnEeu74r7X1vovKw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_ODymAgRpEe6qzcyNffzqYg" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_ODymAQRpEe6qzcyNffzqYg" showIcon="false" labelColor="39,76,114">
-          <customFeatures>labelSize</customFeatures>
-        </endLabelStyle>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_ODymBgRpEe6qzcyNffzqYg" name="[0..*] atTypesToVarsMap" sourceNode="_tR9WQBhnEeu74r7X1vovKw" targetNode="_8NrgEARoEe6qzcyNffzqYg">
-      <target xmi:type="ecore:EReference" href="cbcmodel.ecore#//Condition/atTypesToVarsMap"/>
-      <semanticElements xmi:type="ecore:EReference" href="cbcmodel.ecore#//Condition/atTypesToVarsMap"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_ODzNEARpEe6qzcyNffzqYg" description="_tS_4ERhnEeu74r7X1vovKw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_ODzNEgRpEe6qzcyNffzqYg" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_ODzNEQRpEe6qzcyNffzqYg" showIcon="false" labelColor="39,76,114">
-          <customFeatures>labelSize</customFeatures>
-        </endLabelStyle>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_ODzNFgRpEe6qzcyNffzqYg" name="[0..1] postCondition" sourceNode="_tR99UBhnEeu74r7X1vovKw" targetNode="_tR9WQBhnEeu74r7X1vovKw">
-      <target xmi:type="ecore:EReference" href="cbcmodel.ecore#//AbstractStatement/postCondition"/>
-      <semanticElements xmi:type="ecore:EReference" href="cbcmodel.ecore#//AbstractStatement/postCondition"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_ODz0IARpEe6qzcyNffzqYg" description="_tS_4ERhnEeu74r7X1vovKw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_ODz0IgRpEe6qzcyNffzqYg" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_ODz0IQRpEe6qzcyNffzqYg" showIcon="false" labelColor="39,76,114">
->>>>>>> master
-          <customFeatures>labelSize</customFeatures>
-        </endLabelStyle>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
-    </ownedDiagramElements>
-<<<<<<< HEAD
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_tTAfIBhnEeu74r7X1vovKw" name="[0..1] preCondition" sourceNode="_tR99UBhnEeu74r7X1vovKw" targetNode="_tR9WQBhnEeu74r7X1vovKw">
-      <target xmi:type="ecore:EReference" href="cbcmodel.ecore#//AbstractStatement/preCondition"/>
-      <semanticElements xmi:type="ecore:EReference" href="cbcmodel.ecore#//AbstractStatement/preCondition"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_tTAfIRhnEeu74r7X1vovKw" description="_tS_4ERhnEeu74r7X1vovKw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_tTAfIhhnEeu74r7X1vovKw" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_tTAfIxhnEeu74r7X1vovKw" showIcon="false" labelColor="39,76,114">
-=======
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_ODz0JgRpEe6qzcyNffzqYg" name="[0..1] preCondition" sourceNode="_tR99UBhnEeu74r7X1vovKw" targetNode="_tR9WQBhnEeu74r7X1vovKw">
-      <target xmi:type="ecore:EReference" href="cbcmodel.ecore#//AbstractStatement/preCondition"/>
-      <semanticElements xmi:type="ecore:EReference" href="cbcmodel.ecore#//AbstractStatement/preCondition"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_OD0bMARpEe6qzcyNffzqYg" description="_tS_4ERhnEeu74r7X1vovKw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_OD0bMgRpEe6qzcyNffzqYg" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_OD0bMQRpEe6qzcyNffzqYg" showIcon="false" labelColor="39,76,114">
->>>>>>> master
-          <customFeatures>labelSize</customFeatures>
-        </endLabelStyle>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
-    </ownedDiagramElements>
-<<<<<<< HEAD
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_tTBGMBhnEeu74r7X1vovKw" name="[1..1] firstStatement" sourceNode="_tR_LcRhnEeu74r7X1vovKw" targetNode="_tR99UBhnEeu74r7X1vovKw">
-      <target xmi:type="ecore:EReference" href="cbcmodel.ecore#//CompositionStatement/firstStatement"/>
-      <semanticElements xmi:type="ecore:EReference" href="cbcmodel.ecore#//CompositionStatement/firstStatement"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_tTBGMRhnEeu74r7X1vovKw" description="_tS-C4BhnEeu74r7X1vovKw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_tTBGMhhnEeu74r7X1vovKw" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-          <labelFormat>bold</labelFormat>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_tTBGMxhnEeu74r7X1vovKw" showIcon="false" labelColor="39,76,114">
-=======
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_OD0bNgRpEe6qzcyNffzqYg" name="[1..1] firstStatement" sourceNode="_tR_LcRhnEeu74r7X1vovKw" targetNode="_tR99UBhnEeu74r7X1vovKw">
-      <target xmi:type="ecore:EReference" href="cbcmodel.ecore#//CompositionStatement/firstStatement"/>
-      <semanticElements xmi:type="ecore:EReference" href="cbcmodel.ecore#//CompositionStatement/firstStatement"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_OD1CQARpEe6qzcyNffzqYg" description="_tS-C4BhnEeu74r7X1vovKw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_OD1CQgRpEe6qzcyNffzqYg" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-          <labelFormat>bold</labelFormat>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_OD1CQQRpEe6qzcyNffzqYg" showIcon="false" labelColor="39,76,114">
->>>>>>> master
-          <customFeatures>labelSize</customFeatures>
-        </endLabelStyle>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
-    </ownedDiagramElements>
-<<<<<<< HEAD
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_tTBtQBhnEeu74r7X1vovKw" name="[1..1] secondStatement" sourceNode="_tR_LcRhnEeu74r7X1vovKw" targetNode="_tR99UBhnEeu74r7X1vovKw">
-      <target xmi:type="ecore:EReference" href="cbcmodel.ecore#//CompositionStatement/secondStatement"/>
-      <semanticElements xmi:type="ecore:EReference" href="cbcmodel.ecore#//CompositionStatement/secondStatement"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_tTBtQRhnEeu74r7X1vovKw" description="_tS-C4BhnEeu74r7X1vovKw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_tTBtQhhnEeu74r7X1vovKw" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-          <labelFormat>bold</labelFormat>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_tTBtQxhnEeu74r7X1vovKw" showIcon="false" labelColor="39,76,114">
-=======
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_OD1CRgRpEe6qzcyNffzqYg" name="[1..1] secondStatement" sourceNode="_tR_LcRhnEeu74r7X1vovKw" targetNode="_tR99UBhnEeu74r7X1vovKw">
-      <target xmi:type="ecore:EReference" href="cbcmodel.ecore#//CompositionStatement/secondStatement"/>
-      <semanticElements xmi:type="ecore:EReference" href="cbcmodel.ecore#//CompositionStatement/secondStatement"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_OD1pUARpEe6qzcyNffzqYg" description="_tS-C4BhnEeu74r7X1vovKw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_OD1pUgRpEe6qzcyNffzqYg" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-          <labelFormat>bold</labelFormat>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_OD1pUQRpEe6qzcyNffzqYg" showIcon="false" labelColor="39,76,114">
->>>>>>> master
-          <customFeatures>labelSize</customFeatures>
-        </endLabelStyle>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
-    </ownedDiagramElements>
-<<<<<<< HEAD
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_tTCUUBhnEeu74r7X1vovKw" name="[1..1] intermediateCondition" sourceNode="_tR_LcRhnEeu74r7X1vovKw" targetNode="_tR9WQBhnEeu74r7X1vovKw">
-      <target xmi:type="ecore:EReference" href="cbcmodel.ecore#//CompositionStatement/intermediateCondition"/>
-      <semanticElements xmi:type="ecore:EReference" href="cbcmodel.ecore#//CompositionStatement/intermediateCondition"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_tTCUURhnEeu74r7X1vovKw" description="_tS-C4BhnEeu74r7X1vovKw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_tTCUUhhnEeu74r7X1vovKw" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-          <labelFormat>bold</labelFormat>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_tTCUUxhnEeu74r7X1vovKw" showIcon="false" labelColor="39,76,114">
-=======
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_OD2QYARpEe6qzcyNffzqYg" name="[1..1] intermediateCondition" sourceNode="_tR_LcRhnEeu74r7X1vovKw" targetNode="_tR9WQBhnEeu74r7X1vovKw">
-      <target xmi:type="ecore:EReference" href="cbcmodel.ecore#//CompositionStatement/intermediateCondition"/>
-      <semanticElements xmi:type="ecore:EReference" href="cbcmodel.ecore#//CompositionStatement/intermediateCondition"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_OD2QYQRpEe6qzcyNffzqYg" description="_tS-C4BhnEeu74r7X1vovKw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_OD2QYwRpEe6qzcyNffzqYg" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-          <labelFormat>bold</labelFormat>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_OD2QYgRpEe6qzcyNffzqYg" showIcon="false" labelColor="39,76,114">
->>>>>>> master
-          <customFeatures>labelSize</customFeatures>
-        </endLabelStyle>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
-    </ownedDiagramElements>
-<<<<<<< HEAD
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_tTC7YBhnEeu74r7X1vovKw" name="[0..*] guards" sourceNode="_tR_ygBhnEeu74r7X1vovKw" targetNode="_tR9WQBhnEeu74r7X1vovKw">
-      <target xmi:type="ecore:EReference" href="cbcmodel.ecore#//SelectionStatement/guards"/>
-      <semanticElements xmi:type="ecore:EReference" href="cbcmodel.ecore#//SelectionStatement/guards"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_tTC7YRhnEeu74r7X1vovKw" description="_tS_4ERhnEeu74r7X1vovKw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_tTC7YhhnEeu74r7X1vovKw" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_tTC7YxhnEeu74r7X1vovKw" showIcon="false" labelColor="39,76,114">
-=======
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_OD23cARpEe6qzcyNffzqYg" name="[0..*] guards" sourceNode="_tR_ygBhnEeu74r7X1vovKw" targetNode="_tR9WQBhnEeu74r7X1vovKw">
-      <target xmi:type="ecore:EReference" href="cbcmodel.ecore#//SelectionStatement/guards"/>
-      <semanticElements xmi:type="ecore:EReference" href="cbcmodel.ecore#//SelectionStatement/guards"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_OD23cQRpEe6qzcyNffzqYg" description="_tS_4ERhnEeu74r7X1vovKw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_OD23cwRpEe6qzcyNffzqYg" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_OD23cgRpEe6qzcyNffzqYg" showIcon="false" labelColor="39,76,114">
->>>>>>> master
-          <customFeatures>labelSize</customFeatures>
-        </endLabelStyle>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
-    </ownedDiagramElements>
-<<<<<<< HEAD
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_tTDicBhnEeu74r7X1vovKw" name="[0..*] commands" sourceNode="_tR_ygBhnEeu74r7X1vovKw" targetNode="_tR99UBhnEeu74r7X1vovKw">
-      <target xmi:type="ecore:EReference" href="cbcmodel.ecore#//SelectionStatement/commands"/>
-      <semanticElements xmi:type="ecore:EReference" href="cbcmodel.ecore#//SelectionStatement/commands"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_tTDicRhnEeu74r7X1vovKw" description="_tS_4ERhnEeu74r7X1vovKw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_tTDichhnEeu74r7X1vovKw" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_tTDicxhnEeu74r7X1vovKw" showIcon="false" labelColor="39,76,114">
-=======
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_OD3egwRpEe6qzcyNffzqYg" name="[0..*] commands" sourceNode="_tR_ygBhnEeu74r7X1vovKw" targetNode="_tR99UBhnEeu74r7X1vovKw">
-      <target xmi:type="ecore:EReference" href="cbcmodel.ecore#//SelectionStatement/commands"/>
-      <semanticElements xmi:type="ecore:EReference" href="cbcmodel.ecore#//SelectionStatement/commands"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_OD3ehARpEe6qzcyNffzqYg" description="_tS_4ERhnEeu74r7X1vovKw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_OD3ehgRpEe6qzcyNffzqYg" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_OD3ehQRpEe6qzcyNffzqYg" showIcon="false" labelColor="39,76,114">
->>>>>>> master
-          <customFeatures>labelSize</customFeatures>
-        </endLabelStyle>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
-    </ownedDiagramElements>
-<<<<<<< HEAD
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_tTK3MBhnEeu74r7X1vovKw" name="[1..1] loopStatement" sourceNode="_tSF5IBhnEeu74r7X1vovKw" targetNode="_tR99UBhnEeu74r7X1vovKw">
-      <target xmi:type="ecore:EReference" href="cbcmodel.ecore#//SmallRepetitionStatement/loopStatement"/>
-      <semanticElements xmi:type="ecore:EReference" href="cbcmodel.ecore#//SmallRepetitionStatement/loopStatement"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_tTLeQBhnEeu74r7X1vovKw" description="_tS-C4BhnEeu74r7X1vovKw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_tTLeQRhnEeu74r7X1vovKw" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-          <labelFormat>bold</labelFormat>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_tTLeQhhnEeu74r7X1vovKw" showIcon="false" labelColor="39,76,114">
-=======
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_OD4FkwRpEe6qzcyNffzqYg" name="[1..1] loopStatement" sourceNode="_tSF5IBhnEeu74r7X1vovKw" targetNode="_tR99UBhnEeu74r7X1vovKw">
-      <target xmi:type="ecore:EReference" href="cbcmodel.ecore#//SmallRepetitionStatement/loopStatement"/>
-      <semanticElements xmi:type="ecore:EReference" href="cbcmodel.ecore#//SmallRepetitionStatement/loopStatement"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_OD4soARpEe6qzcyNffzqYg" description="_tS-C4BhnEeu74r7X1vovKw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_OD4sogRpEe6qzcyNffzqYg" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-          <labelFormat>bold</labelFormat>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_OD4soQRpEe6qzcyNffzqYg" showIcon="false" labelColor="39,76,114">
->>>>>>> master
-          <customFeatures>labelSize</customFeatures>
-        </endLabelStyle>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
-    </ownedDiagramElements>
-<<<<<<< HEAD
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_tTLeQxhnEeu74r7X1vovKw" name="[1..1] variant" sourceNode="_tSF5IBhnEeu74r7X1vovKw" targetNode="_tSCOwBhnEeu74r7X1vovKw">
-      <target xmi:type="ecore:EReference" href="cbcmodel.ecore#//SmallRepetitionStatement/variant"/>
-      <semanticElements xmi:type="ecore:EReference" href="cbcmodel.ecore#//SmallRepetitionStatement/variant"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_tTLeRBhnEeu74r7X1vovKw" description="_tS-C4BhnEeu74r7X1vovKw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_tTLeRRhnEeu74r7X1vovKw" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-          <labelFormat>bold</labelFormat>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_tTLeRhhnEeu74r7X1vovKw" showIcon="false" labelColor="39,76,114">
-=======
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_OD4spgRpEe6qzcyNffzqYg" name="[1..1] variant" sourceNode="_tSF5IBhnEeu74r7X1vovKw" targetNode="_tSCOwBhnEeu74r7X1vovKw">
-      <target xmi:type="ecore:EReference" href="cbcmodel.ecore#//SmallRepetitionStatement/variant"/>
-      <semanticElements xmi:type="ecore:EReference" href="cbcmodel.ecore#//SmallRepetitionStatement/variant"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_OD5TsARpEe6qzcyNffzqYg" description="_tS-C4BhnEeu74r7X1vovKw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_OD5TsgRpEe6qzcyNffzqYg" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-          <labelFormat>bold</labelFormat>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_OD5TsQRpEe6qzcyNffzqYg" showIcon="false" labelColor="39,76,114">
->>>>>>> master
-          <customFeatures>labelSize</customFeatures>
-        </endLabelStyle>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
-    </ownedDiagramElements>
-<<<<<<< HEAD
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_tTMFUBhnEeu74r7X1vovKw" name="[1..1] invariant" sourceNode="_tSF5IBhnEeu74r7X1vovKw" targetNode="_tR9WQBhnEeu74r7X1vovKw">
-      <target xmi:type="ecore:EReference" href="cbcmodel.ecore#//SmallRepetitionStatement/invariant"/>
-      <semanticElements xmi:type="ecore:EReference" href="cbcmodel.ecore#//SmallRepetitionStatement/invariant"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_tTMFURhnEeu74r7X1vovKw" description="_tS-C4BhnEeu74r7X1vovKw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_tTMFUhhnEeu74r7X1vovKw" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-          <labelFormat>bold</labelFormat>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_tTMFUxhnEeu74r7X1vovKw" showIcon="false" labelColor="39,76,114">
-=======
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_OD5TtgRpEe6qzcyNffzqYg" name="[1..1] invariant" sourceNode="_tSF5IBhnEeu74r7X1vovKw" targetNode="_tR9WQBhnEeu74r7X1vovKw">
-      <target xmi:type="ecore:EReference" href="cbcmodel.ecore#//SmallRepetitionStatement/invariant"/>
-      <semanticElements xmi:type="ecore:EReference" href="cbcmodel.ecore#//SmallRepetitionStatement/invariant"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_OD6h0ARpEe6qzcyNffzqYg" description="_tS-C4BhnEeu74r7X1vovKw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_OD6h0gRpEe6qzcyNffzqYg" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-          <labelFormat>bold</labelFormat>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_OD6h0QRpEe6qzcyNffzqYg" showIcon="false" labelColor="39,76,114">
->>>>>>> master
-          <customFeatures>labelSize</customFeatures>
-        </endLabelStyle>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
-    </ownedDiagramElements>
-<<<<<<< HEAD
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_tTMFVBhnEeu74r7X1vovKw" name="[1..1] guard" sourceNode="_tSF5IBhnEeu74r7X1vovKw" targetNode="_tR9WQBhnEeu74r7X1vovKw">
-      <target xmi:type="ecore:EReference" href="cbcmodel.ecore#//SmallRepetitionStatement/guard"/>
-      <semanticElements xmi:type="ecore:EReference" href="cbcmodel.ecore#//SmallRepetitionStatement/guard"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_tTMsYBhnEeu74r7X1vovKw" description="_tS-C4BhnEeu74r7X1vovKw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_tTMsYRhnEeu74r7X1vovKw" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-          <labelFormat>bold</labelFormat>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_tTMsYhhnEeu74r7X1vovKw" showIcon="false" labelColor="39,76,114">
-=======
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_OD6h1gRpEe6qzcyNffzqYg" name="[1..1] guard" sourceNode="_tSF5IBhnEeu74r7X1vovKw" targetNode="_tR9WQBhnEeu74r7X1vovKw">
-      <target xmi:type="ecore:EReference" href="cbcmodel.ecore#//SmallRepetitionStatement/guard"/>
-      <semanticElements xmi:type="ecore:EReference" href="cbcmodel.ecore#//SmallRepetitionStatement/guard"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_OD7I4ARpEe6qzcyNffzqYg" description="_tS-C4BhnEeu74r7X1vovKw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_OD7I4gRpEe6qzcyNffzqYg" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-          <labelFormat>bold</labelFormat>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_OD7I4QRpEe6qzcyNffzqYg" showIcon="false" labelColor="39,76,114">
->>>>>>> master
-          <customFeatures>labelSize</customFeatures>
-        </endLabelStyle>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
-    </ownedDiagramElements>
-<<<<<<< HEAD
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_tTMsYxhnEeu74r7X1vovKw" name="[0..*] variables" sourceNode="_tSGgMBhnEeu74r7X1vovKw" targetNode="_tSHuUBhnEeu74r7X1vovKw">
-      <target xmi:type="ecore:EReference" href="cbcmodel.ecore#//JavaVariables/variables"/>
-      <semanticElements xmi:type="ecore:EReference" href="cbcmodel.ecore#//JavaVariables/variables"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_tTNTcBhnEeu74r7X1vovKw" description="_tS_4ERhnEeu74r7X1vovKw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_tTNTcRhnEeu74r7X1vovKw" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_tTNTchhnEeu74r7X1vovKw" showIcon="false" labelColor="39,76,114">
-=======
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_OD7I5gRpEe6qzcyNffzqYg" name="[0..*] variables" sourceNode="_tSGgMBhnEeu74r7X1vovKw" targetNode="_tSHuUBhnEeu74r7X1vovKw">
-      <target xmi:type="ecore:EReference" href="cbcmodel.ecore#//JavaVariables/variables"/>
-      <semanticElements xmi:type="ecore:EReference" href="cbcmodel.ecore#//JavaVariables/variables"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_OD7v8ARpEe6qzcyNffzqYg" description="_tS_4ERhnEeu74r7X1vovKw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_OD7v8gRpEe6qzcyNffzqYg" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_OD7v8QRpEe6qzcyNffzqYg" showIcon="false" labelColor="39,76,114">
->>>>>>> master
-          <customFeatures>labelSize</customFeatures>
-        </endLabelStyle>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
-    </ownedDiagramElements>
-<<<<<<< HEAD
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_tTNTcxhnEeu74r7X1vovKw" name="[0..*] conditions" sourceNode="_tSI8cBhnEeu74r7X1vovKw" targetNode="_tR9WQBhnEeu74r7X1vovKw">
-      <target xmi:type="ecore:EReference" href="cbcmodel.ecore#//GlobalConditions/conditions"/>
-      <semanticElements xmi:type="ecore:EReference" href="cbcmodel.ecore#//GlobalConditions/conditions"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_tTN6gBhnEeu74r7X1vovKw" description="_tS_4ERhnEeu74r7X1vovKw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_tTN6gRhnEeu74r7X1vovKw" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_tTN6ghhnEeu74r7X1vovKw" showIcon="false" labelColor="39,76,114">
-=======
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_OD7v9gRpEe6qzcyNffzqYg" name="[0..*] conditions" sourceNode="_tSI8cBhnEeu74r7X1vovKw" targetNode="_tR9WQBhnEeu74r7X1vovKw">
-      <target xmi:type="ecore:EReference" href="cbcmodel.ecore#//GlobalConditions/conditions"/>
-      <semanticElements xmi:type="ecore:EReference" href="cbcmodel.ecore#//GlobalConditions/conditions"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_OD8XAARpEe6qzcyNffzqYg" description="_tS_4ERhnEeu74r7X1vovKw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_OD8XAgRpEe6qzcyNffzqYg" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_OD8XAQRpEe6qzcyNffzqYg" showIcon="false" labelColor="39,76,114">
->>>>>>> master
-          <customFeatures>labelSize</customFeatures>
-        </endLabelStyle>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
-    </ownedDiagramElements>
-<<<<<<< HEAD
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_tTN6gxhnEeu74r7X1vovKw" name="[0..*] rename" sourceNode="_tSKKkBhnEeu74r7X1vovKw" targetNode="_tSKxoBhnEeu74r7X1vovKw">
-      <target xmi:type="ecore:EReference" href="cbcmodel.ecore#//Renaming/rename"/>
-      <semanticElements xmi:type="ecore:EReference" href="cbcmodel.ecore#//Renaming/rename"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_tTOhkBhnEeu74r7X1vovKw" description="_tS_4ERhnEeu74r7X1vovKw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_tTOhkRhnEeu74r7X1vovKw" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_tTOhkhhnEeu74r7X1vovKw" showIcon="false" labelColor="39,76,114">
-=======
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_OD8XBgRpEe6qzcyNffzqYg" name="[0..*] rename" sourceNode="_tSKKkBhnEeu74r7X1vovKw" targetNode="_tSKxoBhnEeu74r7X1vovKw">
-      <target xmi:type="ecore:EReference" href="cbcmodel.ecore#//Renaming/rename"/>
-      <semanticElements xmi:type="ecore:EReference" href="cbcmodel.ecore#//Renaming/rename"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_OD8-EARpEe6qzcyNffzqYg" description="_tS_4ERhnEeu74r7X1vovKw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_OD8-EgRpEe6qzcyNffzqYg" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_OD8-EQRpEe6qzcyNffzqYg" showIcon="false" labelColor="39,76,114">
->>>>>>> master
-          <customFeatures>labelSize</customFeatures>
-        </endLabelStyle>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
-    </ownedDiagramElements>
-<<<<<<< HEAD
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_tTPvsBhnEeu74r7X1vovKw" name="[0..1] globalcondition" sourceNode="_tSL_wBhnEeu74r7X1vovKw" targetNode="_tSI8cBhnEeu74r7X1vovKw">
-      <target xmi:type="ecore:EReference" href="cbcmodel.ecore#//CbCProblem/globalcondition"/>
-      <semanticElements xmi:type="ecore:EReference" href="cbcmodel.ecore#//CbCProblem/globalcondition"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_tTPvsRhnEeu74r7X1vovKw" description="_tS_4ERhnEeu74r7X1vovKw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_tTPvshhnEeu74r7X1vovKw" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_tTPvsxhnEeu74r7X1vovKw" showIcon="false" labelColor="39,76,114">
-=======
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_OD8-FgRpEe6qzcyNffzqYg" name="[0..1] globalcondition" sourceNode="_tSL_wBhnEeu74r7X1vovKw" targetNode="_tSI8cBhnEeu74r7X1vovKw">
-      <target xmi:type="ecore:EReference" href="cbcmodel.ecore#//CbCProblem/globalcondition"/>
-      <semanticElements xmi:type="ecore:EReference" href="cbcmodel.ecore#//CbCProblem/globalcondition"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_OD8-FwRpEe6qzcyNffzqYg" description="_tS_4ERhnEeu74r7X1vovKw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_OD8-GQRpEe6qzcyNffzqYg" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_OD8-GARpEe6qzcyNffzqYg" showIcon="false" labelColor="39,76,114">
->>>>>>> master
-          <customFeatures>labelSize</customFeatures>
-        </endLabelStyle>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
-    </ownedDiagramElements>
-<<<<<<< HEAD
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_tTQWwBhnEeu74r7X1vovKw" name="[1..1] cbcformula" sourceNode="_tSL_wBhnEeu74r7X1vovKw" targetNode="_tR6S8BhnEeu74r7X1vovKw">
-      <target xmi:type="ecore:EReference" href="cbcmodel.ecore#//CbCProblem/cbcformula"/>
-      <semanticElements xmi:type="ecore:EReference" href="cbcmodel.ecore#//CbCProblem/cbcformula"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_tTQWwRhnEeu74r7X1vovKw" description="_tS-C4BhnEeu74r7X1vovKw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_tTQWwhhnEeu74r7X1vovKw" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-          <labelFormat>bold</labelFormat>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_tTQWwxhnEeu74r7X1vovKw" showIcon="false" labelColor="39,76,114">
-=======
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_OD9lIwRpEe6qzcyNffzqYg" name="[1..1] cbcformula" sourceNode="_tSL_wBhnEeu74r7X1vovKw" targetNode="_tR6S8BhnEeu74r7X1vovKw">
-      <target xmi:type="ecore:EReference" href="cbcmodel.ecore#//CbCProblem/cbcformula"/>
-      <semanticElements xmi:type="ecore:EReference" href="cbcmodel.ecore#//CbCProblem/cbcformula"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_OD9lJARpEe6qzcyNffzqYg" description="_tS-C4BhnEeu74r7X1vovKw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_OD9lJgRpEe6qzcyNffzqYg" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-          <labelFormat>bold</labelFormat>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_OD9lJQRpEe6qzcyNffzqYg" showIcon="false" labelColor="39,76,114">
->>>>>>> master
-          <customFeatures>labelSize</customFeatures>
-        </endLabelStyle>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
-    </ownedDiagramElements>
-<<<<<<< HEAD
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_tTQ90BhnEeu74r7X1vovKw" name="[0..1] javaVariable" sourceNode="_tSL_wBhnEeu74r7X1vovKw" targetNode="_tSGgMBhnEeu74r7X1vovKw">
-      <target xmi:type="ecore:EReference" href="cbcmodel.ecore#//CbCProblem/javaVariable"/>
-      <semanticElements xmi:type="ecore:EReference" href="cbcmodel.ecore#//CbCProblem/javaVariable"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_tTQ90RhnEeu74r7X1vovKw" description="_tS_4ERhnEeu74r7X1vovKw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_tTQ90hhnEeu74r7X1vovKw" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_tTQ90xhnEeu74r7X1vovKw" showIcon="false" labelColor="39,76,114">
-=======
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_OD-MMwRpEe6qzcyNffzqYg" name="[0..1] javaVariable" sourceNode="_tSL_wBhnEeu74r7X1vovKw" targetNode="_tSGgMBhnEeu74r7X1vovKw">
-      <target xmi:type="ecore:EReference" href="cbcmodel.ecore#//CbCProblem/javaVariable"/>
-      <semanticElements xmi:type="ecore:EReference" href="cbcmodel.ecore#//CbCProblem/javaVariable"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_OD-MNARpEe6qzcyNffzqYg" description="_tS_4ERhnEeu74r7X1vovKw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_OD-MNgRpEe6qzcyNffzqYg" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_OD-MNQRpEe6qzcyNffzqYg" showIcon="false" labelColor="39,76,114">
->>>>>>> master
-          <customFeatures>labelSize</customFeatures>
-        </endLabelStyle>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
-    </ownedDiagramElements>
-<<<<<<< HEAD
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_tTRk4BhnEeu74r7X1vovKw" name="[0..1] renaming" sourceNode="_tSL_wBhnEeu74r7X1vovKw" targetNode="_tSKKkBhnEeu74r7X1vovKw">
-      <target xmi:type="ecore:EReference" href="cbcmodel.ecore#//CbCProblem/renaming"/>
-      <semanticElements xmi:type="ecore:EReference" href="cbcmodel.ecore#//CbCProblem/renaming"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_tTRk4RhnEeu74r7X1vovKw" description="_tS_4ERhnEeu74r7X1vovKw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_tTRk4hhnEeu74r7X1vovKw" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_tTRk4xhnEeu74r7X1vovKw" showIcon="false" labelColor="39,76,114">
-=======
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_OEMOoARpEe6qzcyNffzqYg" name="[0..1] renaming" sourceNode="_tSL_wBhnEeu74r7X1vovKw" targetNode="_tSKKkBhnEeu74r7X1vovKw">
-      <target xmi:type="ecore:EReference" href="cbcmodel.ecore#//CbCProblem/renaming"/>
-      <semanticElements xmi:type="ecore:EReference" href="cbcmodel.ecore#//CbCProblem/renaming"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_OEMOoQRpEe6qzcyNffzqYg" description="_tS_4ERhnEeu74r7X1vovKw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_OEMOowRpEe6qzcyNffzqYg" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_OEMOogRpEe6qzcyNffzqYg" showIcon="false" labelColor="39,76,114">
->>>>>>> master
-          <customFeatures>labelSize</customFeatures>
-        </endLabelStyle>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
-    </ownedDiagramElements>
-<<<<<<< HEAD
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_tTXEcBhnEeu74r7X1vovKw" sourceNode="_tR-kYBhnEeu74r7X1vovKw" targetNode="_tR99UBhnEeu74r7X1vovKw">
-      <target xmi:type="ecore:EClass" href="cbcmodel.ecore#//SkipStatement"/>
-      <semanticElements xmi:type="ecore:EClass" href="cbcmodel.ecore#//SkipStatement"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_tTYSkBhnEeu74r7X1vovKw" targetArrow="InputClosedArrow" routingStyle="tree">
-        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_tTYSkRhnEeu74r7X1vovKw" showIcon="false">
-          <labelFormat>italic</labelFormat>
-        </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_tTYSkhhnEeu74r7X1vovKw" showIcon="false"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_tTYSkxhnEeu74r7X1vovKw" sourceNode="_tR_LcRhnEeu74r7X1vovKw" targetNode="_tR99UBhnEeu74r7X1vovKw">
-      <target xmi:type="ecore:EClass" href="cbcmodel.ecore#//CompositionStatement"/>
-      <semanticElements xmi:type="ecore:EClass" href="cbcmodel.ecore#//CompositionStatement"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_tTY5oBhnEeu74r7X1vovKw" targetArrow="InputClosedArrow" routingStyle="tree">
-        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_tTY5oRhnEeu74r7X1vovKw" showIcon="false">
-          <labelFormat>italic</labelFormat>
-        </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_tTY5ohhnEeu74r7X1vovKw" showIcon="false"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_tTY5oxhnEeu74r7X1vovKw" sourceNode="_tR_ygBhnEeu74r7X1vovKw" targetNode="_tR99UBhnEeu74r7X1vovKw">
-      <target xmi:type="ecore:EClass" href="cbcmodel.ecore#//SelectionStatement"/>
-      <semanticElements xmi:type="ecore:EClass" href="cbcmodel.ecore#//SelectionStatement"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_tTZgsBhnEeu74r7X1vovKw" targetArrow="InputClosedArrow" routingStyle="tree">
-        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_tTZgsRhnEeu74r7X1vovKw" showIcon="false">
-          <labelFormat>italic</labelFormat>
-        </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_tTZgshhnEeu74r7X1vovKw" showIcon="false"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_tTaHxBhnEeu74r7X1vovKw" sourceNode="_tSC10RhnEeu74r7X1vovKw" targetNode="_tR99UBhnEeu74r7X1vovKw">
-      <target xmi:type="ecore:EClass" href="cbcmodel.ecore#//ReturnStatement"/>
-      <semanticElements xmi:type="ecore:EClass" href="cbcmodel.ecore#//ReturnStatement"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_tTau0BhnEeu74r7X1vovKw" targetArrow="InputClosedArrow" routingStyle="tree">
-        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_tTau0RhnEeu74r7X1vovKw" showIcon="false">
-          <labelFormat>italic</labelFormat>
-        </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_tTau0hhnEeu74r7X1vovKw" showIcon="false"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_tTckABhnEeu74r7X1vovKw" sourceNode="_tSF5IBhnEeu74r7X1vovKw" targetNode="_tR99UBhnEeu74r7X1vovKw">
-      <target xmi:type="ecore:EClass" href="cbcmodel.ecore#//SmallRepetitionStatement"/>
-      <semanticElements xmi:type="ecore:EClass" href="cbcmodel.ecore#//SmallRepetitionStatement"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_tTckARhnEeu74r7X1vovKw" targetArrow="InputClosedArrow" routingStyle="tree">
-        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_tTckAhhnEeu74r7X1vovKw" showIcon="false">
-          <labelFormat>italic</labelFormat>
-        </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_tTckAxhnEeu74r7X1vovKw" showIcon="false"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_tTdLEBhnEeu74r7X1vovKw" sourceNode="_tSNN4BhnEeu74r7X1vovKw" targetNode="_tR99UBhnEeu74r7X1vovKw">
-      <target xmi:type="ecore:EClass" href="cbcmodel.ecore#//StrengthWeakStatement"/>
-      <semanticElements xmi:type="ecore:EClass" href="cbcmodel.ecore#//StrengthWeakStatement"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_tTdLERhnEeu74r7X1vovKw" targetArrow="InputClosedArrow" routingStyle="tree">
-        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_tTdLEhhnEeu74r7X1vovKw" showIcon="false">
-          <labelFormat>italic</labelFormat>
-        </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_tTdLExhnEeu74r7X1vovKw" showIcon="false"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_tTdyIBhnEeu74r7X1vovKw" sourceNode="_tR99UBhnEeu74r7X1vovKw" targetNode="_tR99UBhnEeu74r7X1vovKw" beginLabel="[0..1] parent" endLabel="[0..1] refinement">
-      <target xmi:type="ecore:EReference" href="cbcmodel.ecore#//AbstractStatement/refinement"/>
-      <semanticElements xmi:type="ecore:EReference" href="cbcmodel.ecore#//AbstractStatement/parent"/>
-      <semanticElements xmi:type="ecore:EReference" href="cbcmodel.ecore#//AbstractStatement/refinement"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_tTeZMxhnEeu74r7X1vovKw" description="_tTeZMBhnEeu74r7X1vovKw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_tTeZNBhnEeu74r7X1vovKw" showIcon="false"/>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_tTeZNRhnEeu74r7X1vovKw" showIcon="false"/>
-=======
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_OEM1sARpEe6qzcyNffzqYg" name="[0..*] value" sourceNode="_8NrgEARoEe6qzcyNffzqYg" targetNode="_8Npq4ARoEe6qzcyNffzqYg">
-      <target xmi:type="ecore:EReference" href="cbcmodel.ecore#//AtTypesToVarsMap/value"/>
-      <semanticElements xmi:type="ecore:EReference" href="cbcmodel.ecore#//AtTypesToVarsMap/value"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_OEM1sQRpEe6qzcyNffzqYg" routingStyle="manhattan" strokeColor="0,0,0">
-        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_OEM1swRpEe6qzcyNffzqYg" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_OEM1sgRpEe6qzcyNffzqYg" showIcon="false" labelColor="39,76,114">
-          <customFeatures>labelSize</customFeatures>
-        </endLabelStyle>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_OEM1twRpEe6qzcyNffzqYg" name="[0..1] value" sourceNode="_8NsuMQRoEe6qzcyNffzqYg" targetNode="_8Nt8UARoEe6qzcyNffzqYg">
-      <target xmi:type="ecore:EReference" href="cbcmodel.ecore#//ConfToVarsMap/value"/>
-      <semanticElements xmi:type="ecore:EReference" href="cbcmodel.ecore#//ConfToVarsMap/value"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_OENcwARpEe6qzcyNffzqYg" routingStyle="manhattan" strokeColor="0,0,0">
-        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_OENcwgRpEe6qzcyNffzqYg" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_OENcwQRpEe6qzcyNffzqYg" showIcon="false" labelColor="39,76,114">
-          <customFeatures>labelSize</customFeatures>
-        </endLabelStyle>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_OEOq4ARpEe6qzcyNffzqYg" sourceNode="_tR-kYBhnEeu74r7X1vovKw" targetNode="_tR99UBhnEeu74r7X1vovKw">
-      <target xmi:type="ecore:EClass" href="cbcmodel.ecore#//SkipStatement"/>
-      <semanticElements xmi:type="ecore:EClass" href="cbcmodel.ecore#//SkipStatement"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_OEQgEARpEe6qzcyNffzqYg" targetArrow="InputClosedArrow" routingStyle="tree">
-        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_OEQgEQRpEe6qzcyNffzqYg" showIcon="false">
-          <labelFormat>italic</labelFormat>
-        </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_OEQgEgRpEe6qzcyNffzqYg" showIcon="false"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_OERHIwRpEe6qzcyNffzqYg" sourceNode="_tR_LcRhnEeu74r7X1vovKw" targetNode="_tR99UBhnEeu74r7X1vovKw">
-      <target xmi:type="ecore:EClass" href="cbcmodel.ecore#//CompositionStatement"/>
-      <semanticElements xmi:type="ecore:EClass" href="cbcmodel.ecore#//CompositionStatement"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_OERuMARpEe6qzcyNffzqYg" targetArrow="InputClosedArrow" routingStyle="tree">
-        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_OERuMQRpEe6qzcyNffzqYg" showIcon="false">
-          <labelFormat>italic</labelFormat>
-        </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_OERuMgRpEe6qzcyNffzqYg" showIcon="false"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_OERuNgRpEe6qzcyNffzqYg" sourceNode="_tR_ygBhnEeu74r7X1vovKw" targetNode="_tR99UBhnEeu74r7X1vovKw">
-      <target xmi:type="ecore:EClass" href="cbcmodel.ecore#//SelectionStatement"/>
-      <semanticElements xmi:type="ecore:EClass" href="cbcmodel.ecore#//SelectionStatement"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_OES8UARpEe6qzcyNffzqYg" targetArrow="InputClosedArrow" routingStyle="tree">
-        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_OES8UQRpEe6qzcyNffzqYg" showIcon="false">
-          <labelFormat>italic</labelFormat>
-        </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_OES8UgRpEe6qzcyNffzqYg" showIcon="false"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_OES8VgRpEe6qzcyNffzqYg" sourceNode="_tSC10RhnEeu74r7X1vovKw" targetNode="_tR99UBhnEeu74r7X1vovKw">
-      <target xmi:type="ecore:EClass" href="cbcmodel.ecore#//ReturnStatement"/>
-      <semanticElements xmi:type="ecore:EClass" href="cbcmodel.ecore#//ReturnStatement"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_OETjYARpEe6qzcyNffzqYg" targetArrow="InputClosedArrow" routingStyle="tree">
-        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_OETjYQRpEe6qzcyNffzqYg" showIcon="false">
-          <labelFormat>italic</labelFormat>
-        </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_OETjYgRpEe6qzcyNffzqYg" showIcon="false"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_OEaREARpEe6qzcyNffzqYg" sourceNode="_tSF5IBhnEeu74r7X1vovKw" targetNode="_tR99UBhnEeu74r7X1vovKw">
-      <target xmi:type="ecore:EClass" href="cbcmodel.ecore#//SmallRepetitionStatement"/>
-      <semanticElements xmi:type="ecore:EClass" href="cbcmodel.ecore#//SmallRepetitionStatement"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_OEaREQRpEe6qzcyNffzqYg" targetArrow="InputClosedArrow" routingStyle="tree">
-        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_OEaREgRpEe6qzcyNffzqYg" showIcon="false">
-          <labelFormat>italic</labelFormat>
-        </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_OEaREwRpEe6qzcyNffzqYg" showIcon="false"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_OEa4IARpEe6qzcyNffzqYg" sourceNode="_tSNN4BhnEeu74r7X1vovKw" targetNode="_tR99UBhnEeu74r7X1vovKw">
-      <target xmi:type="ecore:EClass" href="cbcmodel.ecore#//StrengthWeakStatement"/>
-      <semanticElements xmi:type="ecore:EClass" href="cbcmodel.ecore#//StrengthWeakStatement"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_OEa4IQRpEe6qzcyNffzqYg" targetArrow="InputClosedArrow" routingStyle="tree">
-        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_OEa4IgRpEe6qzcyNffzqYg" showIcon="false">
-          <labelFormat>italic</labelFormat>
-        </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_OEa4IwRpEe6qzcyNffzqYg" showIcon="false"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_OEcGQARpEe6qzcyNffzqYg" sourceNode="_tR99UBhnEeu74r7X1vovKw" targetNode="_tR99UBhnEeu74r7X1vovKw" beginLabel="[0..1] parent" endLabel="[0..1] refinement">
-      <target xmi:type="ecore:EReference" href="cbcmodel.ecore#//AbstractStatement/refinement"/>
-      <semanticElements xmi:type="ecore:EReference" href="cbcmodel.ecore#//AbstractStatement/parent"/>
-      <semanticElements xmi:type="ecore:EReference" href="cbcmodel.ecore#//AbstractStatement/refinement"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_OEctUARpEe6qzcyNffzqYg" description="_tTeZMBhnEeu74r7X1vovKw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_OEctUQRpEe6qzcyNffzqYg" showIcon="false"/>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_OEctUgRpEe6qzcyNffzqYg" showIcon="false"/>
->>>>>>> master
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='Bi-directional%20EC_EReference%20']"/>
-    </ownedDiagramElements>
-    <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
-    <filterVariableHistory xmi:type="diagram:FilterVariableHistory" uid="_rIKYNhhnEeu74r7X1vovKw"/>
-    <activatedLayers xmi:type="description_1:Layer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer"/>
-    <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']"/>
-    <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Validation']"/>
-    <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Archetype']/@ownedRepresentationExtensions[name='Entities%20With%20Archetypes']/@layers[name='Archetypes']"/>
-    <target xmi:type="ecore:EPackage" href="cbcmodel.ecore#/"/>
-  </diagram:DSemanticDiagram>
-  <diagram:DSemanticDiagram uid="_oHCJwFdCEeuHCOoWYWPwVw">
-    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_oHCJwVdCEeuHCOoWYWPwVw" source="DANNOTATION_CUSTOMIZATION_KEY">
-      <data xmi:type="diagram:ComputedStyleDescriptionRegistry" uid="_oHCJwldCEeuHCOoWYWPwVw">
-        <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_olZgwFdCEeuHCOoWYWPwVw" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-          <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_olZgwVdCEeuHCOoWYWPwVw" showIcon="false" labelExpression="service:render">
-            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-          </centerLabelStyleDescription>
-          <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_olZgwldCEeuHCOoWYWPwVw" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-          </endLabelStyleDescription>
-        </computedStyleDescriptions>
-<<<<<<< HEAD
-=======
-        <computedStyleDescriptions xmi:type="style:BundledImageDescription" xmi:id="_OEr94ARpEe6qzcyNffzqYg" labelExpression="service:render" labelAlignment="LEFT" tooltipExpression="service:renderTooltip" sizeComputationExpression="1">
-          <borderColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-          <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-          <color xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-        </computedStyleDescriptions>
-        <computedStyleDescriptions xmi:type="style:BundledImageDescription" xmi:id="_OEyEgARpEe6qzcyNffzqYg" labelExpression="service:renderAsNode" labelAlignment="LEFT" tooltipExpression="service:renderTooltip" sizeComputationExpression="1">
-          <borderColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-          <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-          <color xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
-        </computedStyleDescriptions>
-        <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_OE4LIARpEe6qzcyNffzqYg" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-          <beginLabelStyleDescription xmi:type="style:BeginLabelStyleDescription" xmi:id="_OE4LIQRpEe6qzcyNffzqYg" showIcon="false" labelExpression="service:renderEOpposite">
-            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-          </beginLabelStyleDescription>
-          <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_OE4LIgRpEe6qzcyNffzqYg" showIcon="false" labelExpression="service:render">
-            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-          </endLabelStyleDescription>
-        </computedStyleDescriptions>
->>>>>>> master
-      </data>
-    </ownedAnnotationEntries>
-    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_oHKsoFdCEeuHCOoWYWPwVw" source="GMF_DIAGRAMS">
-      <data xmi:type="notation:Diagram" xmi:id="_oHKsoVdCEeuHCOoWYWPwVw" type="Sirius" element="_oHCJwFdCEeuHCOoWYWPwVw" measurementUnit="Pixel">
-        <children xmi:type="notation:Node" xmi:id="_oleZQFdCEeuHCOoWYWPwVw" type="2003" element="_olJpIFdCEeuHCOoWYWPwVw">
-          <children xmi:type="notation:Node" xmi:id="_olfAUFdCEeuHCOoWYWPwVw" type="5007"/>
-          <children xmi:type="notation:Node" xmi:id="_olfnYFdCEeuHCOoWYWPwVw" type="7004">
-<<<<<<< HEAD
-            <children xmi:type="notation:Node" xmi:id="_olhclFdCEeuHCOoWYWPwVw" type="3010" element="_olTaIFdCEeuHCOoWYWPwVw">
-              <styles xmi:type="notation:FontStyle" xmi:id="_olhclVdCEeuHCOoWYWPwVw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_olhclldCEeuHCOoWYWPwVw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_olhcl1dCEeuHCOoWYWPwVw" type="3010" element="_olUBMVdCEeuHCOoWYWPwVw">
-              <styles xmi:type="notation:FontStyle" xmi:id="_olhcmFdCEeuHCOoWYWPwVw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_olhcmVdCEeuHCOoWYWPwVw"/>
-            </children>
-=======
-            <children xmi:type="notation:Node" xmi:id="_olhclFdCEeuHCOoWYWPwVw" type="3010" element="_OEmeUgRpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_olhclVdCEeuHCOoWYWPwVw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_olhclldCEeuHCOoWYWPwVw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_olhcl1dCEeuHCOoWYWPwVw" type="3010" element="_OEnFYQRpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_olhcmFdCEeuHCOoWYWPwVw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_olhcmVdCEeuHCOoWYWPwVw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_OJtn0ARpEe6qzcyNffzqYg" type="3010" element="_OEnscARpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_OJtn0QRpEe6qzcyNffzqYg" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_OJtn0gRpEe6qzcyNffzqYg"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_OJuO4ARpEe6qzcyNffzqYg" type="3010" element="_OEnscgRpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_OJuO4QRpEe6qzcyNffzqYg" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_OJuO4gRpEe6qzcyNffzqYg"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_OJuO4wRpEe6qzcyNffzqYg" type="3010" element="_OEoTgARpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_OJuO5ARpEe6qzcyNffzqYg" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_OJuO5QRpEe6qzcyNffzqYg"/>
-            </children>
->>>>>>> master
-            <styles xmi:type="notation:SortingStyle" xmi:id="_olfnYVdCEeuHCOoWYWPwVw"/>
-            <styles xmi:type="notation:FilteringStyle" xmi:id="_olfnYldCEeuHCOoWYWPwVw"/>
-          </children>
-          <styles xmi:type="notation:ShapeStyle" xmi:id="_oleZQVdCEeuHCOoWYWPwVw" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oleZQldCEeuHCOoWYWPwVw" x="539" y="343"/>
-        </children>
-        <children xmi:type="notation:Node" xmi:id="_olfnY1dCEeuHCOoWYWPwVw" type="2003" element="_olLeUFdCEeuHCOoWYWPwVw">
-          <children xmi:type="notation:Node" xmi:id="_olgOcFdCEeuHCOoWYWPwVw" type="5007"/>
-          <children xmi:type="notation:Node" xmi:id="_olgOcVdCEeuHCOoWYWPwVw" type="7004">
-<<<<<<< HEAD
-            <children xmi:type="notation:Node" xmi:id="_oliDoFdCEeuHCOoWYWPwVw" type="3010" element="_olXrkVdCEeuHCOoWYWPwVw">
-              <styles xmi:type="notation:FontStyle" xmi:id="_oliDoVdCEeuHCOoWYWPwVw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_oliDoldCEeuHCOoWYWPwVw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_oliqsFdCEeuHCOoWYWPwVw" type="3010" element="_olXrk1dCEeuHCOoWYWPwVw">
-              <styles xmi:type="notation:FontStyle" xmi:id="_oliqsVdCEeuHCOoWYWPwVw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_oliqsldCEeuHCOoWYWPwVw"/>
-            </children>
-=======
-            <children xmi:type="notation:Node" xmi:id="_oliDoFdCEeuHCOoWYWPwVw" type="3010" element="_OEzSogRpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_oliDoVdCEeuHCOoWYWPwVw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_oliDoldCEeuHCOoWYWPwVw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_oliqsFdCEeuHCOoWYWPwVw" type="3010" element="_OEzSpARpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_oliqsVdCEeuHCOoWYWPwVw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_oliqsldCEeuHCOoWYWPwVw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_OJu18ARpEe6qzcyNffzqYg" type="3010" element="_OEz5sARpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_OJu18QRpEe6qzcyNffzqYg" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_OJu18gRpEe6qzcyNffzqYg"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_OJu18wRpEe6qzcyNffzqYg" type="3010" element="_OEz5sgRpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_OJu19ARpEe6qzcyNffzqYg" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_OJu19QRpEe6qzcyNffzqYg"/>
-            </children>
->>>>>>> master
-            <styles xmi:type="notation:SortingStyle" xmi:id="_olgOcldCEeuHCOoWYWPwVw"/>
-            <styles xmi:type="notation:FilteringStyle" xmi:id="_olgOc1dCEeuHCOoWYWPwVw"/>
-          </children>
-          <styles xmi:type="notation:ShapeStyle" xmi:id="_olfnZFdCEeuHCOoWYWPwVw" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_olfnZVdCEeuHCOoWYWPwVw"/>
-        </children>
-        <children xmi:type="notation:Node" xmi:id="_olgOdFdCEeuHCOoWYWPwVw" type="2003" element="_olMFYFdCEeuHCOoWYWPwVw">
-          <children xmi:type="notation:Node" xmi:id="_olgOd1dCEeuHCOoWYWPwVw" type="5007"/>
-          <children xmi:type="notation:Node" xmi:id="_olgOeFdCEeuHCOoWYWPwVw" type="7004">
-<<<<<<< HEAD
-            <children xmi:type="notation:Node" xmi:id="_oliqs1dCEeuHCOoWYWPwVw" type="3010" element="_olUoQFdCEeuHCOoWYWPwVw">
-              <styles xmi:type="notation:FontStyle" xmi:id="_oliqtFdCEeuHCOoWYWPwVw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_oliqtVdCEeuHCOoWYWPwVw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_oliqtldCEeuHCOoWYWPwVw" type="3010" element="_olUoQldCEeuHCOoWYWPwVw">
-              <styles xmi:type="notation:FontStyle" xmi:id="_oliqt1dCEeuHCOoWYWPwVw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_oliquFdCEeuHCOoWYWPwVw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_oljRwFdCEeuHCOoWYWPwVw" type="3010" element="_olVPUVdCEeuHCOoWYWPwVw">
-              <styles xmi:type="notation:FontStyle" xmi:id="_oljRwVdCEeuHCOoWYWPwVw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_oljRwldCEeuHCOoWYWPwVw"/>
-            </children>
-=======
-            <children xmi:type="notation:Node" xmi:id="_oliqs1dCEeuHCOoWYWPwVw" type="3010" element="_OEo6kARpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_oliqtFdCEeuHCOoWYWPwVw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_oliqtVdCEeuHCOoWYWPwVw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_oliqtldCEeuHCOoWYWPwVw" type="3010" element="_OEphoQRpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_oliqt1dCEeuHCOoWYWPwVw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_oliquFdCEeuHCOoWYWPwVw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_oljRwFdCEeuHCOoWYWPwVw" type="3010" element="_OEqIsQRpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_oljRwVdCEeuHCOoWYWPwVw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_oljRwldCEeuHCOoWYWPwVw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_OJu19gRpEe6qzcyNffzqYg" type="3010" element="_OEqvwARpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_OJu19wRpEe6qzcyNffzqYg" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_OJu1-ARpEe6qzcyNffzqYg"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_OJu1-QRpEe6qzcyNffzqYg" type="3010" element="_OErW0ARpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_OJu1-gRpEe6qzcyNffzqYg" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_OJu1-wRpEe6qzcyNffzqYg"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_OJvdAARpEe6qzcyNffzqYg" type="3010" element="_OErW0gRpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_OJvdAQRpEe6qzcyNffzqYg" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_OJvdAgRpEe6qzcyNffzqYg"/>
-            </children>
->>>>>>> master
-            <styles xmi:type="notation:SortingStyle" xmi:id="_olgOeVdCEeuHCOoWYWPwVw"/>
-            <styles xmi:type="notation:FilteringStyle" xmi:id="_olgOeldCEeuHCOoWYWPwVw"/>
-          </children>
-          <styles xmi:type="notation:ShapeStyle" xmi:id="_olgOdVdCEeuHCOoWYWPwVw" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_olgOdldCEeuHCOoWYWPwVw" x="147" y="161"/>
-        </children>
-<<<<<<< HEAD
-        <children xmi:type="notation:Node" xmi:id="_olg1gFdCEeuHCOoWYWPwVw" type="2003" element="_olMscFdCEeuHCOoWYWPwVw">
-          <children xmi:type="notation:Node" xmi:id="_olg1g1dCEeuHCOoWYWPwVw" type="5007"/>
-          <children xmi:type="notation:Node" xmi:id="_olg1hFdCEeuHCOoWYWPwVw" type="7004">
-            <children xmi:type="notation:Node" xmi:id="_oljRw1dCEeuHCOoWYWPwVw" type="3010" element="_olVPU1dCEeuHCOoWYWPwVw">
-              <styles xmi:type="notation:FontStyle" xmi:id="_oljRxFdCEeuHCOoWYWPwVw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_oljRxVdCEeuHCOoWYWPwVw"/>
-            </children>
-            <styles xmi:type="notation:SortingStyle" xmi:id="_olg1hVdCEeuHCOoWYWPwVw"/>
-            <styles xmi:type="notation:FilteringStyle" xmi:id="_olg1hldCEeuHCOoWYWPwVw"/>
-          </children>
-          <styles xmi:type="notation:ShapeStyle" xmi:id="_olg1gVdCEeuHCOoWYWPwVw" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_olg1gldCEeuHCOoWYWPwVw" x="630"/>
-        </children>
-        <children xmi:type="notation:Node" xmi:id="_olg1h1dCEeuHCOoWYWPwVw" type="2003" element="_olNTgVdCEeuHCOoWYWPwVw">
-          <children xmi:type="notation:Node" xmi:id="_olhckFdCEeuHCOoWYWPwVw" type="5007"/>
-          <children xmi:type="notation:Node" xmi:id="_olhckVdCEeuHCOoWYWPwVw" type="7004">
-            <children xmi:type="notation:Node" xmi:id="_oljRxldCEeuHCOoWYWPwVw" type="3010" element="_olV2YVdCEeuHCOoWYWPwVw">
-              <styles xmi:type="notation:FontStyle" xmi:id="_oljRx1dCEeuHCOoWYWPwVw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_oljRyFdCEeuHCOoWYWPwVw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_oljRyVdCEeuHCOoWYWPwVw" type="3010" element="_olWdcFdCEeuHCOoWYWPwVw">
-              <styles xmi:type="notation:FontStyle" xmi:id="_oljRyldCEeuHCOoWYWPwVw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_oljRy1dCEeuHCOoWYWPwVw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_olj40FdCEeuHCOoWYWPwVw" type="3010" element="_olXEgFdCEeuHCOoWYWPwVw">
-              <styles xmi:type="notation:FontStyle" xmi:id="_olj40VdCEeuHCOoWYWPwVw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_olj40ldCEeuHCOoWYWPwVw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_olj401dCEeuHCOoWYWPwVw" type="3010" element="_olXEgldCEeuHCOoWYWPwVw">
-              <styles xmi:type="notation:FontStyle" xmi:id="_olj41FdCEeuHCOoWYWPwVw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_olj41VdCEeuHCOoWYWPwVw"/>
-            </children>
-=======
-        <children xmi:type="notation:Node" xmi:id="_olg1h1dCEeuHCOoWYWPwVw" type="2003" element="_olNTgVdCEeuHCOoWYWPwVw">
-          <children xmi:type="notation:Node" xmi:id="_olhckFdCEeuHCOoWYWPwVw" type="5007"/>
-          <children xmi:type="notation:Node" xmi:id="_olhckVdCEeuHCOoWYWPwVw" type="7004">
-            <children xmi:type="notation:Node" xmi:id="_oljRxldCEeuHCOoWYWPwVw" type="3010" element="_OEtzEARpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_oljRx1dCEeuHCOoWYWPwVw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_oljRyFdCEeuHCOoWYWPwVw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_OJvdAwRpEe6qzcyNffzqYg" type="3010" element="_OEuaIQRpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_OJvdBARpEe6qzcyNffzqYg" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_OJvdBQRpEe6qzcyNffzqYg"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_olj40FdCEeuHCOoWYWPwVw" type="3010" element="_OEvBMARpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_olj40VdCEeuHCOoWYWPwVw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_olj40ldCEeuHCOoWYWPwVw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_OJvdBgRpEe6qzcyNffzqYg" type="3010" element="_OEvBMgRpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_OJvdBwRpEe6qzcyNffzqYg" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_OJvdCARpEe6qzcyNffzqYg"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_OJvdCQRpEe6qzcyNffzqYg" type="3010" element="_OEvoQQRpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_OJvdCgRpEe6qzcyNffzqYg" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_OJvdCwRpEe6qzcyNffzqYg"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_oljRyVdCEeuHCOoWYWPwVw" type="3010" element="_OEwPUQRpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_oljRyldCEeuHCOoWYWPwVw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_oljRy1dCEeuHCOoWYWPwVw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_OJvdDARpEe6qzcyNffzqYg" type="3010" element="_OEw2YQRpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_OJvdDQRpEe6qzcyNffzqYg" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_OJvdDgRpEe6qzcyNffzqYg"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_olj401dCEeuHCOoWYWPwVw" type="3010" element="_OExdcARpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_olj41FdCEeuHCOoWYWPwVw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_olj41VdCEeuHCOoWYWPwVw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_OJvdDwRpEe6qzcyNffzqYg" type="3010" element="_OExdcgRpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_OJvdEARpEe6qzcyNffzqYg" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_OJvdEQRpEe6qzcyNffzqYg"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_OJwEEARpEe6qzcyNffzqYg" type="3010" element="_OEyEggRpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_OJwEEQRpEe6qzcyNffzqYg" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_OJwEEgRpEe6qzcyNffzqYg"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_OJwEEwRpEe6qzcyNffzqYg" type="3010" element="_OEyrkQRpEe6qzcyNffzqYg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_OJwEFARpEe6qzcyNffzqYg" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_OJwEFQRpEe6qzcyNffzqYg"/>
-            </children>
->>>>>>> master
-            <styles xmi:type="notation:SortingStyle" xmi:id="_olhckldCEeuHCOoWYWPwVw"/>
-            <styles xmi:type="notation:FilteringStyle" xmi:id="_olhck1dCEeuHCOoWYWPwVw"/>
-          </children>
-          <styles xmi:type="notation:ShapeStyle" xmi:id="_olg1iFdCEeuHCOoWYWPwVw" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_olg1iVdCEeuHCOoWYWPwVw" x="469" y="161"/>
-        </children>
-        <styles xmi:type="notation:DiagramStyle" xmi:id="_oHKsoldCEeuHCOoWYWPwVw"/>
-<<<<<<< HEAD
-        <edges xmi:type="notation:Edge" xmi:id="_ollG8FdCEeuHCOoWYWPwVw" type="4001" element="_olY5sFdCEeuHCOoWYWPwVw" source="_oleZQFdCEeuHCOoWYWPwVw" target="_olgOdFdCEeuHCOoWYWPwVw">
-=======
-        <edges xmi:type="notation:Edge" xmi:id="_ollG8FdCEeuHCOoWYWPwVw" type="4001" element="_OE0gwARpEe6qzcyNffzqYg" source="_oleZQFdCEeuHCOoWYWPwVw" target="_olgOdFdCEeuHCOoWYWPwVw">
->>>>>>> master
-          <children xmi:type="notation:Node" xmi:id="_olluAFdCEeuHCOoWYWPwVw" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_olluAVdCEeuHCOoWYWPwVw" y="-10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_olmVEFdCEeuHCOoWYWPwVw" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_olmVEVdCEeuHCOoWYWPwVw" y="10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_olm8IFdCEeuHCOoWYWPwVw" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_olm8IVdCEeuHCOoWYWPwVw" y="10"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_ollG8VdCEeuHCOoWYWPwVw" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_ollG8ldCEeuHCOoWYWPwVw" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ollG81dCEeuHCOoWYWPwVw" points="[0, -50, 332, 120]$[-332, -110, 0, 60]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_olp_cFdCEeuHCOoWYWPwVw" id="(0.5,0.5)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_olp_cVdCEeuHCOoWYWPwVw" id="(0.5,0.5)"/>
-        </edges>
-<<<<<<< HEAD
-        <edges xmi:type="notation:Edge" xmi:id="_olp_cldCEeuHCOoWYWPwVw" type="4001" element="_olZgxldCEeuHCOoWYWPwVw" source="_oleZQFdCEeuHCOoWYWPwVw" target="_olg1gFdCEeuHCOoWYWPwVw">
-          <children xmi:type="notation:Node" xmi:id="_olqmgFdCEeuHCOoWYWPwVw" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_olqmgVdCEeuHCOoWYWPwVw" y="-10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_olqmgldCEeuHCOoWYWPwVw" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_olqmg1dCEeuHCOoWYWPwVw" y="10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_olqmhFdCEeuHCOoWYWPwVw" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_olqmhVdCEeuHCOoWYWPwVw" y="10"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_olp_c1dCEeuHCOoWYWPwVw" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_olp_dFdCEeuHCOoWYWPwVw" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_olp_dVdCEeuHCOoWYWPwVw" points="[0, -50, -71, 290]$[187, -111, 116, 229]$[187, -230, 116, 110]$[71, -290, 0, 50]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_olqmhldCEeuHCOoWYWPwVw" id="(0.5,0.5)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_olqmh1dCEeuHCOoWYWPwVw" id="(0.5,0.5)"/>
-        </edges>
-        <edges xmi:type="notation:Edge" xmi:id="_olqmiFdCEeuHCOoWYWPwVw" type="4001" element="_olau4FdCEeuHCOoWYWPwVw" source="_oleZQFdCEeuHCOoWYWPwVw" target="_olg1h1dCEeuHCOoWYWPwVw">
-          <children xmi:type="notation:Node" xmi:id="_olqmjFdCEeuHCOoWYWPwVw" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_olqmjVdCEeuHCOoWYWPwVw" y="-10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_olqmjldCEeuHCOoWYWPwVw" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_olqmj1dCEeuHCOoWYWPwVw" y="10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_olqmkFdCEeuHCOoWYWPwVw" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_olqmkVdCEeuHCOoWYWPwVw" y="10"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_olqmiVdCEeuHCOoWYWPwVw" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_olqmildCEeuHCOoWYWPwVw" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_olqmi1dCEeuHCOoWYWPwVw" points="[0, 0, 45, 60]$[-45, -60, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_olrNkFdCEeuHCOoWYWPwVw" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_olrNkVdCEeuHCOoWYWPwVw" id="(0.5,1.0)"/>
-        </edges>
-        <edges xmi:type="notation:Edge" xmi:id="_olrNkldCEeuHCOoWYWPwVw" type="4001" element="_olau5FdCEeuHCOoWYWPwVw" source="_olg1h1dCEeuHCOoWYWPwVw" target="_olg1gFdCEeuHCOoWYWPwVw">
-          <children xmi:type="notation:Node" xmi:id="_olrNlldCEeuHCOoWYWPwVw" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_olrNl1dCEeuHCOoWYWPwVw" y="-10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_olrNmFdCEeuHCOoWYWPwVw" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_olrNmVdCEeuHCOoWYWPwVw" y="10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_olrNmldCEeuHCOoWYWPwVw" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_olrNm1dCEeuHCOoWYWPwVw" y="10"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_olrNk1dCEeuHCOoWYWPwVw" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_olrNlFdCEeuHCOoWYWPwVw" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_olrNlVdCEeuHCOoWYWPwVw" points="[0, -60, -116, 110]$[116, -120, 0, 50]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_olrNnFdCEeuHCOoWYWPwVw" id="(0.5,0.5)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_olrNnVdCEeuHCOoWYWPwVw" id="(0.5,0.5)"/>
-        </edges>
-        <edges xmi:type="notation:Edge" xmi:id="_olrNnldCEeuHCOoWYWPwVw" type="4001" element="_olbV81dCEeuHCOoWYWPwVw" source="_olg1h1dCEeuHCOoWYWPwVw" target="_olg1gFdCEeuHCOoWYWPwVw">
-          <children xmi:type="notation:Node" xmi:id="_olrNoldCEeuHCOoWYWPwVw" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_olrNo1dCEeuHCOoWYWPwVw" y="-10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_olrNpFdCEeuHCOoWYWPwVw" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_olrNpVdCEeuHCOoWYWPwVw" y="10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_olrNpldCEeuHCOoWYWPwVw" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_olrNp1dCEeuHCOoWYWPwVw" y="10"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_olrNn1dCEeuHCOoWYWPwVw" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_olrNoFdCEeuHCOoWYWPwVw" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_olrNoVdCEeuHCOoWYWPwVw" points="[0, -60, -116, 110]$[116, -120, 0, 50]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_olr0oFdCEeuHCOoWYWPwVw" id="(0.5,0.5)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_olr0oVdCEeuHCOoWYWPwVw" id="(0.5,0.5)"/>
-        </edges>
-      </data>
-    </ownedAnnotationEntries>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_olJpIFdCEeuHCOoWYWPwVw" name="ModelClass" tooltipText="" outgoingEdges="_olY5sFdCEeuHCOoWYWPwVw _olZgxldCEeuHCOoWYWPwVw _olau4FdCEeuHCOoWYWPwVw" width="12" height="10">
-=======
-        <edges xmi:type="notation:Edge" xmi:id="_OJwEFgRpEe6qzcyNffzqYg" type="4001" element="_OE1u5gRpEe6qzcyNffzqYg" source="_oleZQFdCEeuHCOoWYWPwVw" target="_oleZQFdCEeuHCOoWYWPwVw">
-          <children xmi:type="notation:Node" xmi:id="_OJwrIARpEe6qzcyNffzqYg" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OJwrIQRpEe6qzcyNffzqYg" y="-10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_OJwrIgRpEe6qzcyNffzqYg" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OJwrIwRpEe6qzcyNffzqYg" y="10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_OJwrJARpEe6qzcyNffzqYg" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OJwrJQRpEe6qzcyNffzqYg" y="10"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_OJwEFwRpEe6qzcyNffzqYg" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_OJwEGARpEe6qzcyNffzqYg" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_OJwEGQRpEe6qzcyNffzqYg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OJxSMARpEe6qzcyNffzqYg" id="(0.5,0.5)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OJxSMQRpEe6qzcyNffzqYg" id="(0.5,0.5)"/>
-        </edges>
-        <edges xmi:type="notation:Edge" xmi:id="_OJxSMgRpEe6qzcyNffzqYg" type="4001" element="_OE3kEARpEe6qzcyNffzqYg" source="_oleZQFdCEeuHCOoWYWPwVw" target="_olg1h1dCEeuHCOoWYWPwVw">
-          <children xmi:type="notation:Node" xmi:id="_OJxSNgRpEe6qzcyNffzqYg" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OJxSNwRpEe6qzcyNffzqYg" y="-10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_OJxSOARpEe6qzcyNffzqYg" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OJxSOQRpEe6qzcyNffzqYg" y="10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_OJxSOgRpEe6qzcyNffzqYg" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OJxSOwRpEe6qzcyNffzqYg" y="10"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_OJxSMwRpEe6qzcyNffzqYg" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_OJxSNARpEe6qzcyNffzqYg" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_OJxSNQRpEe6qzcyNffzqYg" points="[0, 0, 70, 182]$[-70, -182, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OJx5QARpEe6qzcyNffzqYg" id="(0.5,0.5)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OJx5QQRpEe6qzcyNffzqYg" id="(0.5,0.5)"/>
-        </edges>
-      </data>
-    </ownedAnnotationEntries>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_olJpIFdCEeuHCOoWYWPwVw" name="ModelClass" tooltipText="" outgoingEdges="_OE0gwARpEe6qzcyNffzqYg _OE1u5gRpEe6qzcyNffzqYg _OE3kEARpEe6qzcyNffzqYg" incomingEdges="_OE1u5gRpEe6qzcyNffzqYg" width="12" height="10">
->>>>>>> master
-      <target xmi:type="ecore:EClass" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//ModelClass"/>
-      <semanticElements xmi:type="ecore:EClass" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//ModelClass"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_olKQMFdCEeuHCOoWYWPwVw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
-        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-<<<<<<< HEAD
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_olTaIFdCEeuHCOoWYWPwVw" name="name : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//ModelClass/name"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//ModelClass/name"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_olUBMFdCEeuHCOoWYWPwVw" labelAlignment="LEFT">
-=======
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_OEmeUgRpEe6qzcyNffzqYg" name="name : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//ModelClass/name"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//ModelClass/name"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_OEnFYARpEe6qzcyNffzqYg" labelAlignment="LEFT">
->>>>>>> master
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-<<<<<<< HEAD
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_olUBMVdCEeuHCOoWYWPwVw" name="javaClassURI : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//ModelClass/javaClassURI"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//ModelClass/javaClassURI"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_olUBMldCEeuHCOoWYWPwVw" labelAlignment="LEFT">
-=======
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_OEnFYQRpEe6qzcyNffzqYg" name="javaClassURI : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//ModelClass/javaClassURI"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//ModelClass/javaClassURI"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_OEnFYgRpEe6qzcyNffzqYg" labelAlignment="LEFT">
->>>>>>> master
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-<<<<<<< HEAD
-=======
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_OEnscARpEe6qzcyNffzqYg" name="package : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//ModelClass/package"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//ModelClass/package"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_OEnscQRpEe6qzcyNffzqYg" labelAlignment="LEFT">
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_OEnscgRpEe6qzcyNffzqYg" name="feature : EString = default" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//ModelClass/feature"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//ModelClass/feature"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_OEnscwRpEe6qzcyNffzqYg" labelAlignment="LEFT">
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_OEoTgARpEe6qzcyNffzqYg" name=" classInvariants : Condition" tooltipText="">
-        <target xmi:type="ecore:EReference" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//ModelClass/classInvariants"/>
-        <semanticElements xmi:type="ecore:EReference" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//ModelClass/classInvariants"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_OEoTgQRpEe6qzcyNffzqYg" labelAlignment="LEFT" color="114,159,207">
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']"/>
-      </ownedElements>
->>>>>>> master
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_olLeUFdCEeuHCOoWYWPwVw" name="Visibility" tooltipText="" width="12" height="10">
-      <target xmi:type="ecore:EEnum" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Visibility"/>
-      <semanticElements xmi:type="ecore:EEnum" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Visibility"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_olLeUVdCEeuHCOoWYWPwVw" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="221,236,202">
-        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@style"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']"/>
-<<<<<<< HEAD
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_olXrkVdCEeuHCOoWYWPwVw" name="PUBLIC" tooltipText="">
-        <target xmi:type="ecore:EEnumLiteral" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Visibility/PUBLIC"/>
-        <semanticElements xmi:type="ecore:EEnumLiteral" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Visibility/PUBLIC"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_olXrkldCEeuHCOoWYWPwVw" labelAlignment="LEFT">
-=======
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_OEzSogRpEe6qzcyNffzqYg" name="PUBLIC" tooltipText="">
-        <target xmi:type="ecore:EEnumLiteral" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Visibility/PUBLIC"/>
-        <semanticElements xmi:type="ecore:EEnumLiteral" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Visibility/PUBLIC"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_OEzSowRpEe6qzcyNffzqYg" labelAlignment="LEFT">
->>>>>>> master
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>
-      </ownedElements>
-<<<<<<< HEAD
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_olXrk1dCEeuHCOoWYWPwVw" name="PRIVATE" tooltipText="">
-        <target xmi:type="ecore:EEnumLiteral" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Visibility/PRIVATE"/>
-        <semanticElements xmi:type="ecore:EEnumLiteral" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Visibility/PRIVATE"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_olYSoFdCEeuHCOoWYWPwVw" labelAlignment="LEFT">
-=======
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_OEzSpARpEe6qzcyNffzqYg" name="PRIVATE" tooltipText="">
-        <target xmi:type="ecore:EEnumLiteral" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Visibility/PRIVATE"/>
-        <semanticElements xmi:type="ecore:EEnumLiteral" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Visibility/PRIVATE"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_OEzSpQRpEe6qzcyNffzqYg" labelAlignment="LEFT">
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>
-      </ownedElements>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_OEz5sARpEe6qzcyNffzqYg" name="PROTECTED" tooltipText="">
-        <target xmi:type="ecore:EEnumLiteral" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Visibility/PROTECTED"/>
-        <semanticElements xmi:type="ecore:EEnumLiteral" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Visibility/PROTECTED"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_OEz5sQRpEe6qzcyNffzqYg" labelAlignment="LEFT">
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>
-      </ownedElements>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_OEz5sgRpEe6qzcyNffzqYg" name="PACKAGE" tooltipText="">
-        <target xmi:type="ecore:EEnumLiteral" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Visibility/PACKAGE"/>
-        <semanticElements xmi:type="ecore:EEnumLiteral" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Visibility/PACKAGE"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_OEz5swRpEe6qzcyNffzqYg" labelAlignment="LEFT">
->>>>>>> master
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>
-      </ownedElements>
-    </ownedDiagramElements>
-<<<<<<< HEAD
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_olMFYFdCEeuHCOoWYWPwVw" name="Field" tooltipText="" incomingEdges="_olY5sFdCEeuHCOoWYWPwVw" width="12" height="10">
-=======
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_olMFYFdCEeuHCOoWYWPwVw" name="Field" tooltipText="" incomingEdges="_OE0gwARpEe6qzcyNffzqYg" width="12" height="10">
->>>>>>> master
-      <target xmi:type="ecore:EClass" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Field"/>
-      <semanticElements xmi:type="ecore:EClass" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Field"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_olMFYVdCEeuHCOoWYWPwVw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
-        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-<<<<<<< HEAD
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_olUoQFdCEeuHCOoWYWPwVw" name="visibility : Visibility = PUBLIC" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Field/visibility"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Field/visibility"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_olUoQVdCEeuHCOoWYWPwVw" labelAlignment="LEFT">
-=======
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_OEo6kARpEe6qzcyNffzqYg" name="visibility : Visibility = PUBLIC" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Field/visibility"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Field/visibility"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_OEphoARpEe6qzcyNffzqYg" labelAlignment="LEFT">
->>>>>>> master
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-<<<<<<< HEAD
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_olUoQldCEeuHCOoWYWPwVw" name="type : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Field/type"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Field/type"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_olVPUFdCEeuHCOoWYWPwVw" labelAlignment="LEFT">
-=======
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_OEphoQRpEe6qzcyNffzqYg" name="type : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Field/type"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Field/type"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_OEqIsARpEe6qzcyNffzqYg" labelAlignment="LEFT">
->>>>>>> master
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-<<<<<<< HEAD
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_olVPUVdCEeuHCOoWYWPwVw" name="name : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Field/name"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Field/name"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_olVPUldCEeuHCOoWYWPwVw" labelAlignment="LEFT">
-=======
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_OEqIsQRpEe6qzcyNffzqYg" name="name : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Field/name"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Field/name"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_OEqIsgRpEe6qzcyNffzqYg" labelAlignment="LEFT">
->>>>>>> master
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-<<<<<<< HEAD
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_olMscFdCEeuHCOoWYWPwVw" name="Condition" tooltipText="" incomingEdges="_olZgxldCEeuHCOoWYWPwVw _olau5FdCEeuHCOoWYWPwVw _olbV81dCEeuHCOoWYWPwVw" width="12" height="10">
-      <target xmi:type="ecore:EClass" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Condition"/>
-      <semanticElements xmi:type="ecore:EClass" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Condition"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_olNTgFdCEeuHCOoWYWPwVw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
-        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_olVPU1dCEeuHCOoWYWPwVw" name="name : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Condition/name"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Condition/name"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_olV2YFdCEeuHCOoWYWPwVw" labelAlignment="LEFT">
-=======
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_OEqvwARpEe6qzcyNffzqYg" name="isStatic : EBoolean = false" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Field/isStatic"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Field/isStatic"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_OEqvwQRpEe6qzcyNffzqYg" labelAlignment="LEFT">
->>>>>>> master
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-<<<<<<< HEAD
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_olNTgVdCEeuHCOoWYWPwVw" name="Method" tooltipText="" outgoingEdges="_olau5FdCEeuHCOoWYWPwVw _olbV81dCEeuHCOoWYWPwVw" incomingEdges="_olau4FdCEeuHCOoWYWPwVw" width="12" height="10">
-=======
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_OErW0ARpEe6qzcyNffzqYg" name="isFinal : EBoolean = false" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Field/isFinal"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Field/isFinal"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_OErW0QRpEe6qzcyNffzqYg" labelAlignment="LEFT">
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_OErW0gRpEe6qzcyNffzqYg" name="/displayedName : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Field/displayedName"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Field/displayedName"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_OEr94QRpEe6qzcyNffzqYg" labelColor="39,76,114" labelAlignment="LEFT" description="_OEr94ARpEe6qzcyNffzqYg"/>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_olNTgVdCEeuHCOoWYWPwVw" name="Method" tooltipText="" incomingEdges="_OE3kEARpEe6qzcyNffzqYg" width="12" height="10">
->>>>>>> master
-      <target xmi:type="ecore:EClass" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Method"/>
-      <semanticElements xmi:type="ecore:EClass" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Method"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_olN6kFdCEeuHCOoWYWPwVw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
-        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-<<<<<<< HEAD
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_olV2YVdCEeuHCOoWYWPwVw" name="cbcDiagramURI : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Method/cbcDiagramURI"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Method/cbcDiagramURI"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_olV2YldCEeuHCOoWYWPwVw" labelAlignment="LEFT">
-=======
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_OEtzEARpEe6qzcyNffzqYg" name="cbcDiagramURI : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Method/cbcDiagramURI"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Method/cbcDiagramURI"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_OEuaIARpEe6qzcyNffzqYg" labelAlignment="LEFT">
->>>>>>> master
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-<<<<<<< HEAD
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_olWdcFdCEeuHCOoWYWPwVw" name="signature : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Method/signature"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Method/signature"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_olWdcVdCEeuHCOoWYWPwVw" labelAlignment="LEFT">
-=======
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_OEuaIQRpEe6qzcyNffzqYg" name="name : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Method/name"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Method/name"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_OEuaIgRpEe6qzcyNffzqYg" labelAlignment="LEFT">
->>>>>>> master
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-<<<<<<< HEAD
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_olXEgFdCEeuHCOoWYWPwVw" name="assignable : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Method/assignable"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Method/assignable"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_olXEgVdCEeuHCOoWYWPwVw" labelAlignment="LEFT">
-=======
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_OEvBMARpEe6qzcyNffzqYg" name="assignable : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Method/assignable"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Method/assignable"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_OEvBMQRpEe6qzcyNffzqYg" labelAlignment="LEFT">
->>>>>>> master
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-<<<<<<< HEAD
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_olXEgldCEeuHCOoWYWPwVw" name=" cbcStartTriple : CbCFormula" tooltipText="">
-        <target xmi:type="ecore:EReference" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Method/cbcStartTriple"/>
-        <semanticElements xmi:type="ecore:EReference" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Method/cbcStartTriple"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_olXrkFdCEeuHCOoWYWPwVw" labelAlignment="LEFT" color="114,159,207">
-=======
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_OEvBMgRpEe6qzcyNffzqYg" name="returnType : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Method/returnType"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Method/returnType"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_OEvoQARpEe6qzcyNffzqYg" labelAlignment="LEFT">
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_OEvoQQRpEe6qzcyNffzqYg" name="visibility : Visibility = PUBLIC" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Method/visibility"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Method/visibility"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_OEwPUARpEe6qzcyNffzqYg" labelAlignment="LEFT">
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_OEwPUQRpEe6qzcyNffzqYg" name="/signature : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Method/signature"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Method/signature"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_OEw2YARpEe6qzcyNffzqYg" labelColor="39,76,114" labelAlignment="LEFT" description="_OEr94ARpEe6qzcyNffzqYg"/>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_OEw2YQRpEe6qzcyNffzqYg" name="isStatic : EBoolean = false" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Method/isStatic"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Method/isStatic"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_OEw2YgRpEe6qzcyNffzqYg" labelAlignment="LEFT">
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_OExdcARpEe6qzcyNffzqYg" name=" cbcStartTriple : CbCFormula" tooltipText="">
-        <target xmi:type="ecore:EReference" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Method/cbcStartTriple"/>
-        <semanticElements xmi:type="ecore:EReference" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Method/cbcStartTriple"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_OExdcQRpEe6qzcyNffzqYg" labelAlignment="LEFT" color="114,159,207">
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']"/>
-      </ownedElements>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_OExdcgRpEe6qzcyNffzqYg" name=" /precondition : Condition" tooltipText="">
-        <target xmi:type="ecore:EReference" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Method/precondition"/>
-        <semanticElements xmi:type="ecore:EReference" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Method/precondition"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_OEyEgQRpEe6qzcyNffzqYg" labelColor="39,76,114" labelAlignment="LEFT" description="_OEyEgARpEe6qzcyNffzqYg" color="114,159,207"/>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']"/>
-      </ownedElements>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_OEyEggRpEe6qzcyNffzqYg" name=" /postcondition : Condition" tooltipText="">
-        <target xmi:type="ecore:EReference" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Method/postcondition"/>
-        <semanticElements xmi:type="ecore:EReference" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Method/postcondition"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_OEyrkARpEe6qzcyNffzqYg" labelColor="39,76,114" labelAlignment="LEFT" description="_OEyEgARpEe6qzcyNffzqYg" color="114,159,207"/>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']"/>
-      </ownedElements>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_OEyrkQRpEe6qzcyNffzqYg" name=" parameters : Parameter" tooltipText="">
-        <target xmi:type="ecore:EReference" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Method/parameters"/>
-        <semanticElements xmi:type="ecore:EReference" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Method/parameters"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_OEyrkgRpEe6qzcyNffzqYg" labelAlignment="LEFT" color="114,159,207">
->>>>>>> master
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']"/>
-      </ownedElements>
-    </ownedDiagramElements>
-<<<<<<< HEAD
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_olY5sFdCEeuHCOoWYWPwVw" name="[0..*] fields" sourceNode="_olJpIFdCEeuHCOoWYWPwVw" targetNode="_olMFYFdCEeuHCOoWYWPwVw">
-      <target xmi:type="ecore:EReference" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//ModelClass/fields"/>
-      <semanticElements xmi:type="ecore:EReference" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//ModelClass/fields"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_olZgw1dCEeuHCOoWYWPwVw" description="_olZgwFdCEeuHCOoWYWPwVw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_olZgxFdCEeuHCOoWYWPwVw" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_olZgxVdCEeuHCOoWYWPwVw" showIcon="false" labelColor="39,76,114">
-=======
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_OE0gwARpEe6qzcyNffzqYg" name="[0..*] fields" sourceNode="_olJpIFdCEeuHCOoWYWPwVw" targetNode="_olMFYFdCEeuHCOoWYWPwVw">
-      <target xmi:type="ecore:EReference" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//ModelClass/fields"/>
-      <semanticElements xmi:type="ecore:EReference" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//ModelClass/fields"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_OE1u4ARpEe6qzcyNffzqYg" description="_olZgwFdCEeuHCOoWYWPwVw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_OE1u4gRpEe6qzcyNffzqYg" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_OE1u4QRpEe6qzcyNffzqYg" showIcon="false" labelColor="39,76,114">
->>>>>>> master
-          <customFeatures>labelSize</customFeatures>
-        </endLabelStyle>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
-    </ownedDiagramElements>
-<<<<<<< HEAD
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_olZgxldCEeuHCOoWYWPwVw" name="[0..*] classInvariants" sourceNode="_olJpIFdCEeuHCOoWYWPwVw" targetNode="_olMscFdCEeuHCOoWYWPwVw">
-      <target xmi:type="ecore:EReference" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//ModelClass/classInvariants"/>
-      <semanticElements xmi:type="ecore:EReference" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//ModelClass/classInvariants"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_olaH0FdCEeuHCOoWYWPwVw" description="_olZgwFdCEeuHCOoWYWPwVw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_olaH0VdCEeuHCOoWYWPwVw" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_olaH0ldCEeuHCOoWYWPwVw" showIcon="false" labelColor="39,76,114">
-=======
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_OE1u5gRpEe6qzcyNffzqYg" name="[0..1] inheritsFrom" sourceNode="_olJpIFdCEeuHCOoWYWPwVw" targetNode="_olJpIFdCEeuHCOoWYWPwVw">
-      <target xmi:type="ecore:EReference" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//ModelClass/inheritsFrom"/>
-      <semanticElements xmi:type="ecore:EReference" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//ModelClass/inheritsFrom"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_OE2V8ARpEe6qzcyNffzqYg" routingStyle="manhattan" strokeColor="0,0,0">
-        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_OE2V8gRpEe6qzcyNffzqYg" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_OE2V8QRpEe6qzcyNffzqYg" showIcon="false" labelColor="39,76,114">
->>>>>>> master
-          <customFeatures>labelSize</customFeatures>
-        </endLabelStyle>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
-    </ownedDiagramElements>
-<<<<<<< HEAD
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_olau4FdCEeuHCOoWYWPwVw" name="[0..*] methods" sourceNode="_olJpIFdCEeuHCOoWYWPwVw" targetNode="_olNTgVdCEeuHCOoWYWPwVw">
-      <target xmi:type="ecore:EReference" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//ModelClass/methods"/>
-      <semanticElements xmi:type="ecore:EReference" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//ModelClass/methods"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_olau4VdCEeuHCOoWYWPwVw" description="_olZgwFdCEeuHCOoWYWPwVw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_olau4ldCEeuHCOoWYWPwVw" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_olau41dCEeuHCOoWYWPwVw" showIcon="false" labelColor="39,76,114">
-          <customFeatures>labelSize</customFeatures>
-        </endLabelStyle>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_olau5FdCEeuHCOoWYWPwVw" name="[0..1] precondition" sourceNode="_olNTgVdCEeuHCOoWYWPwVw" targetNode="_olMscFdCEeuHCOoWYWPwVw">
-      <target xmi:type="ecore:EReference" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Method/precondition"/>
-      <semanticElements xmi:type="ecore:EReference" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Method/precondition"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_olbV8FdCEeuHCOoWYWPwVw" description="_olZgwFdCEeuHCOoWYWPwVw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_olbV8VdCEeuHCOoWYWPwVw" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_olbV8ldCEeuHCOoWYWPwVw" showIcon="false" labelColor="39,76,114">
-          <customFeatures>labelSize</customFeatures>
-        </endLabelStyle>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_olbV81dCEeuHCOoWYWPwVw" name="[0..1] postcondition" sourceNode="_olNTgVdCEeuHCOoWYWPwVw" targetNode="_olMscFdCEeuHCOoWYWPwVw">
-      <target xmi:type="ecore:EReference" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Method/postcondition"/>
-      <semanticElements xmi:type="ecore:EReference" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Method/postcondition"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_olb9AFdCEeuHCOoWYWPwVw" description="_olZgwFdCEeuHCOoWYWPwVw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_olb9AVdCEeuHCOoWYWPwVw" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_olb9AldCEeuHCOoWYWPwVw" showIcon="false" labelColor="39,76,114">
-          <customFeatures>labelSize</customFeatures>
-        </endLabelStyle>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
-=======
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_OE3kEARpEe6qzcyNffzqYg" sourceNode="_olJpIFdCEeuHCOoWYWPwVw" targetNode="_olNTgVdCEeuHCOoWYWPwVw" beginLabel="[0..1] parentClass" endLabel="[0..*] methods">
-      <target xmi:type="ecore:EReference" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//ModelClass/methods"/>
-      <semanticElements xmi:type="ecore:EReference" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//ModelClass/methods"/>
-      <semanticElements xmi:type="ecore:EReference" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Method/parentClass"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_OE4LIwRpEe6qzcyNffzqYg" description="_OE4LIARpEe6qzcyNffzqYg" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_OE4LJARpEe6qzcyNffzqYg" showIcon="false"/>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_OE4LJQRpEe6qzcyNffzqYg" showIcon="false"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='Bi-directional%20EC_EReference%20']"/>
->>>>>>> master
-    </ownedDiagramElements>
-    <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
-    <filterVariableHistory xmi:type="diagram:FilterVariableHistory" uid="_oHCJxldCEeuHCOoWYWPwVw"/>
-    <activatedLayers xmi:type="description_1:Layer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer"/>
-    <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']"/>
-    <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Validation']"/>
-    <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Archetype']/@ownedRepresentationExtensions[name='Entities%20With%20Archetypes']/@layers[name='Archetypes']"/>
-    <target xmi:type="ecore:EPackage" href="platform:/resource/de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#/"/>
-  </diagram:DSemanticDiagram>
-</xmi:XMI>
diff --git a/de.tu-bs.cs.isf.cbc.model/model/cbcmodel.ecore.orig b/de.tu-bs.cs.isf.cbc.model/model/cbcmodel.ecore.orig
deleted file mode 100644
index 366c597f1..000000000
--- a/de.tu-bs.cs.isf.cbc.model/model/cbcmodel.ecore.orig
+++ /dev/null
@@ -1,209 +0,0 @@
-<?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"
-<<<<<<< HEAD
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="cbcmodel" nsURI="http://www.example.org/cbcmodel" nsPrefix="cbcmodel">
-=======
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="cbcmodel" nsURI="http://www.example.org/cbcmodel" nsPrefix="de.tu-bs.cs.isf.cbc.cbcmodel">
->>>>>>> master
-  <eClassifiers xsi:type="ecore:EClass" name="CbCFormula">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="statement" lowerBound="1"
-        eType="#//AbstractStatement" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="preCondition" lowerBound="1"
-        eType="#//Condition" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="postCondition" lowerBound="1"
-        eType="#//Condition" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="proven" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="comment" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="compositionTechnique" eType="#//CompositionTechnique"
-        defaultValueLiteral="CONTRACT_OVERRIDING"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="className" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
-        defaultValueLiteral=""/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="methodName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
-        defaultValueLiteral=""/>
-<<<<<<< HEAD
-    <eStructuralFeatures xsi:type="ecore:EReference" name="methodObj" eType="ecore:EClass ../../de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Method"
-        eOpposite="../../de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Method/cbcStartTriple"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Condition">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-=======
-    <eStructuralFeatures xsi:type="ecore:EReference" name="methodObj" eType="ecore:EClass cbcclass.ecore#//Method"
-        eOpposite="cbcclass.ecore#//Method/cbcStartTriple"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="tested" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="atType" upperBound="-1"
-        eType="#//AtType" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="security" upperBound="-1"
-        eType="#//Security" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Condition">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="modifiables" upperBound="-1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="confToVarsMap" upperBound="-1"
-        eType="#//ConfToVarsMap" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="atTypesToVarsMap" upperBound="-1"
-        eType="#//AtTypesToVarsMap" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="capsulesUsed" upperBound="-1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" transient="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="codeRepresentation" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
->>>>>>> master
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="AbstractStatement">
-    <eOperations name="generateID" lowerBound="1"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="refinement" eType="#//AbstractStatement"
-        containment="true" eOpposite="#//AbstractStatement/parent"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="parent" eType="#//AbstractStatement"
-        eOpposite="#//AbstractStatement/refinement"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="postCondition" eType="#//Condition"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="preCondition" eType="#//Condition"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="proven" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="comment" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-<<<<<<< HEAD
-=======
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="tested" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="context" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeableResult" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeableText" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="codeRepresentation" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
->>>>>>> master
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="SkipStatement" eSuperTypes="#//AbstractStatement"/>
-  <eClassifiers xsi:type="ecore:EClass" name="CompositionStatement" eSuperTypes="#//AbstractStatement">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="firstStatement" lowerBound="1"
-        eType="#//AbstractStatement" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="secondStatement" lowerBound="1"
-        eType="#//AbstractStatement" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="intermediateCondition"
-        lowerBound="1" eType="#//Condition" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="SelectionStatement" eSuperTypes="#//AbstractStatement">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="guards" upperBound="-1"
-        eType="#//Condition" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="commands" upperBound="-1"
-        eType="#//AbstractStatement" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="preProve" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MethodStatement" eSuperTypes="#//AbstractStatement"/>
-  <eClassifiers xsi:type="ecore:EClass" name="Variant">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ReturnStatement" eSuperTypes="#//AbstractStatement"/>
-  <eClassifiers xsi:type="ecore:EClass" name="SmallRepetitionStatement" eSuperTypes="#//AbstractStatement">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="loopStatement" lowerBound="1"
-        eType="#//AbstractStatement" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="variant" lowerBound="1"
-        eType="#//Variant" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="invariant" lowerBound="1"
-        eType="#//Condition" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="guard" lowerBound="1" eType="#//Condition"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="variantProven" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="preProven" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="postProven" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="JavaVariables">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="variables" upperBound="-1"
-        eType="#//JavaVariable" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="fields" upperBound="-1"
-<<<<<<< HEAD
-        eType="ecore:EClass ../../de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Field">
-=======
-        eType="ecore:EClass cbcclass.ecore#//Field">
->>>>>>> master
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="get" value="if (eDirectResource() != null) { &#x9;&#x9;&#x9;if (eDirectResource().getResourceSet() != null) { &#x9;&#x9;&#x9;&#x9;if (eDirectResource().getResourceSet().getResources() != null) { &#x9;&#x9;&#x9;&#x9;&#x9;EList&lt;Resource> resources = eDirectResource().getResourceSet().getResources(); &#x9;&#x9;&#x9;&#x9;&#x9;URI uri = eDirectResource().getURI(); &#x9;&#x9;&#x9;&#x9;&#x9;uri = uri.trimSegments(1); &#x9;&#x9;&#x9;&#x9;&#x9;uri = uri.appendSegment(uri.lastSegment() + &quot;.cbcclass&quot;); &#x9;&#x9;&#x9;&#x9;&#x9;for (Resource res : resources) { &#x9;&#x9;&#x9;&#x9;&#x9;&#x9;if (res.getURI().equals(uri)) { &#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;EList&lt;EObject> content = res.getContents(); &#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;for (EObject o : content) { &#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;if (o instanceof ModelClass) { &#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;return ((ModelClass) o).getFields(); &#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;} &#x9;&#x9;&#x9;&#x9;&#x9;&#x9;&#x9;} &#x9;&#x9;&#x9;&#x9;&#x9;&#x9;} &#x9;&#x9;&#x9;&#x9;&#x9;} &#x9;&#x9;&#x9;&#x9;} &#x9;&#x9;&#x9;} &#x9;&#x9;}&#x9; &#x9;&#x9;if (fields == null) { &#x9;&#x9;&#x9;fields = new EObjectResolvingEList&lt;Field>(Field.class, this, CbcmodelPackage.JAVA_VARIABLES__FIELDS); &#x9;&#x9;} &#x9;&#x9;return fields;"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="params" upperBound="-1"
-<<<<<<< HEAD
-        eType="ecore:EClass ../../de.tu_bs.cs.isf.cbc.cbcclass.model/model/cbcclass.ecore#//Parameter"
-        containment="true">
-=======
-        eType="ecore:EClass cbcclass.ecore#//Parameter" containment="true">
->>>>>>> master
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="get"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="JavaVariable">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
-        defaultValueLiteral="int a"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" unique="false" eType="#//VariableKind"
-        defaultValueLiteral="LOCAL"/>
-<<<<<<< HEAD
-=======
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="confidentiality" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="modifier" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
->>>>>>> master
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayedName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
-        changeable="false" volatile="true" transient="true" defaultValueLiteral="kind + &quot; &quot; + name"
-        unsettable="true" derived="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="get" value="return getKind() + &quot; &quot; + getName();"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="GlobalConditions">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="conditions" upperBound="-1"
-        eType="#//Condition" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Renaming">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="rename" upperBound="-1"
-        eType="#//Rename" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Rename">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="function" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="newName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="CbCProblem">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="globalcondition" eType="#//GlobalConditions"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="cbcformula" lowerBound="1"
-        eType="#//CbCFormula" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="javaVariable" eType="#//JavaVariables"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="renaming" eType="#//Renaming"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="StrengthWeakStatement" eSuperTypes="#//AbstractStatement"/>
-  <eClassifiers xsi:type="ecore:EEnum" name="VariableKind">
-    <eLiterals name="LOCAL" literal="LOCAL"/>
-    <eLiterals name="PARAM" value="1" literal="PARAM"/>
-    <eLiterals name="RETURN" value="2" literal="RETURN"/>
-    <eLiterals name="GLOBAL" value="3"/>
-    <eLiterals name="GLOBAL_PARAM" value="4" literal="GLOBAL_PARAM"/>
-    <eLiterals name="RETURNPARAM" value="5"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="CompositionTechnique">
-    <eLiterals name="CONTRACT_OVERRIDING"/>
-    <eLiterals name="EXPLICIT_CONTRACTING" value="1"/>
-    <eLiterals name="CONJUNCTIVE_CONTRACTING" value="2" literal="CONJUNCTIVE_CONTRACTING"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="OriginalStatement" eSuperTypes="#//AbstractStatement"/>
-<<<<<<< HEAD
-=======
-  <eClassifiers xsi:type="ecore:EClass" name="ConfToVarsMap" instanceClassName="java.util.Map$Entry">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="key" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="value" eType="#//Security"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Security">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="level" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="mutationModifier" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="AtTypesToVarsMap" instanceClassName="java.util.Map$Entry">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="key" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="value" upperBound="-1"
-        eType="#//AtType"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="AtType">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
->>>>>>> master
-</ecore:EPackage>
diff --git a/de.tu-bs.cs.isf.cbc.model/plugin.xml.orig b/de.tu-bs.cs.isf.cbc.model/plugin.xml.orig
deleted file mode 100644
index ed329cf40..000000000
--- a/de.tu-bs.cs.isf.cbc.model/plugin.xml.orig
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<!--
--->
-
-<plugin>
-
-<<<<<<< HEAD
-
-   <extension point="org.eclipse.emf.ecore.generated_package">
-      <!-- @generated test -->
-      <package
-            uri="http://www.example.org/cbcmodel"
-            class="de.tu_bs.cs.isf.cbc.cbcmodel.CbcmodelPackage"
-            genModel="model/test.genmodel"/>
-=======
-   <extension point="org.eclipse.emf.ecore.generated_package">
-      <!-- @generated genmodel -->
-      <package
-            uri="http://www.example.org/cbcmodel"
-            class="de.tu_bs.cs.isf.cbc.cbcmodel.CbcmodelPackage"
-            genModel="model/genmodel.genmodel"/>
-   </extension>
-
-   <extension point="org.eclipse.emf.ecore.generated_package">
-      <!-- @generated genmodel -->
-      <package
-            uri="http://www.example.org/cbcclass"
-            class="de.tu_bs.cs.isf.cbc.cbcclass.CbcclassPackage"
-            genModel="model/genmodel.genmodel"/>
->>>>>>> master
-   </extension>
-
-</plugin>
diff --git a/de.tu-bs.cs.isf.cbc.model/src-gen/de/tu_bs/cs/isf/cbc/cbcmodel/impl/JavaVariablesImpl.java.orig b/de.tu-bs.cs.isf.cbc.model/src-gen/de/tu_bs/cs/isf/cbc/cbcmodel/impl/JavaVariablesImpl.java.orig
deleted file mode 100644
index cd78feb9b..000000000
--- a/de.tu-bs.cs.isf.cbc.model/src-gen/de/tu_bs/cs/isf/cbc/cbcmodel/impl/JavaVariablesImpl.java.orig
+++ /dev/null
@@ -1,550 +0,0 @@
-<<<<<<< HEAD
-/**
- */
-package de.tu_bs.cs.isf.cbc.cbcmodel.impl;
-
-import de.tu_bs.cs.isf.cbc.cbcclass.model.cbcclass.Field;
-import de.tu_bs.cs.isf.cbc.cbcclass.model.cbcclass.Method;
-import de.tu_bs.cs.isf.cbc.cbcclass.model.cbcclass.ModelClass;
-import de.tu_bs.cs.isf.cbc.cbcclass.model.cbcclass.Parameter;
-import de.tu_bs.cs.isf.cbc.cbcmodel.CbcmodelPackage;
-import de.tu_bs.cs.isf.cbc.cbcmodel.JavaVariable;
-import de.tu_bs.cs.isf.cbc.cbcmodel.JavaVariables;
-import java.util.Collection;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Java Variables</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link de.tu_bs.cs.isf.cbc.cbcmodel.impl.JavaVariablesImpl#getVariables <em>Variables</em>}</li>
- *   <li>{@link de.tu_bs.cs.isf.cbc.cbcmodel.impl.JavaVariablesImpl#getFields <em>Fields</em>}</li>
- *   <li>{@link de.tu_bs.cs.isf.cbc.cbcmodel.impl.JavaVariablesImpl#getParams <em>Params</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class JavaVariablesImpl extends MinimalEObjectImpl.Container implements JavaVariables {
-	/**
-	 * The cached value of the '{@link #getVariables() <em>Variables</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVariables()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<JavaVariable> variables;
-
-	/**
-	 * The cached value of the '{@link #getFields() <em>Fields</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFields()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<Field> fields;
-
-	/**
-	 * The cached value of the '{@link #getParams() <em>Params</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getParams()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<Parameter> params;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected JavaVariablesImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return CbcmodelPackage.Literals.JAVA_VARIABLES;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EList<JavaVariable> getVariables() {
-		if (variables == null) {
-			variables = new EObjectContainmentEList<JavaVariable>(JavaVariable.class, this, CbcmodelPackage.JAVA_VARIABLES__VARIABLES);
-		}
-		return variables;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	@Override
-	public EList<Field> getFields() {
-		if (eDirectResource() != null) {
-			if (eDirectResource().getResourceSet() != null) {
-				if (eDirectResource().getResourceSet().getResources() != null) {
-					EList<Resource> resources = eDirectResource().getResourceSet().getResources();
-					URI uri = eDirectResource().getURI();
-					uri = uri.trimSegments(1);
-					uri = uri.appendSegment(uri.lastSegment() + ".cbcclass");
-					for (Resource res : resources) {
-						if (res.getURI().equals(uri)) {
-							EList<EObject> content = res.getContents();
-							for (EObject o : content) {
-								if (o instanceof ModelClass) {
-									return ((ModelClass) o).getFields();
-								}
-							}
-						}
-					}
-				}
-			}
-		}	
-		if (fields == null) {
-			fields = new EObjectResolvingEList<Field>(Field.class, this, CbcmodelPackage.JAVA_VARIABLES__FIELDS);
-		}
-		return fields;
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	@Override
-	public EList<Parameter> getParams() {
-		if (eDirectResource() != null) {
-			String methodName = eDirectResource().getURI().trimFileExtension().lastSegment();
-			if (eDirectResource().getResourceSet() != null) {
-				if (eDirectResource().getResourceSet().getResources() != null) {
-					EList<Resource> resources = eDirectResource().getResourceSet().getResources();
-					URI uri = eDirectResource().getURI();
-					uri = uri.trimSegments(1);
-					uri = uri.appendSegment(uri.lastSegment() + ".cbcclass");
-					for (Resource res : resources) {
-						if (res.getURI().equals(uri) || res.getURI().toString().endsWith(uri.toString().replace("platform:/resource",""))) {
-							EList<EObject> content = res.getContents();
-							for (EObject o : content) {
-								if (o instanceof ModelClass) {
-									ModelClass mc = (ModelClass) o;
-									for (Method method : mc.getMethods()) {
-										if (method.getName().equals(methodName)) {
-											return method.getParameters();
-										}
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-		if (params == null) {
-			params = new EObjectResolvingEList<Parameter>(Parameter.class, this, CbcmodelPackage.JAVA_VARIABLES__PARAMS);
-		}
-		return params;	
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case CbcmodelPackage.JAVA_VARIABLES__VARIABLES:
-				return ((InternalEList<?>)getVariables()).basicRemove(otherEnd, msgs);
-			case CbcmodelPackage.JAVA_VARIABLES__PARAMS:
-				return ((InternalEList<?>)getParams()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case CbcmodelPackage.JAVA_VARIABLES__VARIABLES:
-				return getVariables();
-			case CbcmodelPackage.JAVA_VARIABLES__FIELDS:
-				return getFields();
-			case CbcmodelPackage.JAVA_VARIABLES__PARAMS:
-				return getParams();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case CbcmodelPackage.JAVA_VARIABLES__VARIABLES:
-				getVariables().clear();
-				getVariables().addAll((Collection<? extends JavaVariable>)newValue);
-				return;
-			case CbcmodelPackage.JAVA_VARIABLES__FIELDS:
-				getFields().clear();
-				getFields().addAll((Collection<? extends Field>)newValue);
-				return;
-			case CbcmodelPackage.JAVA_VARIABLES__PARAMS:
-				getParams().clear();
-				getParams().addAll((Collection<? extends Parameter>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case CbcmodelPackage.JAVA_VARIABLES__VARIABLES:
-				getVariables().clear();
-				return;
-			case CbcmodelPackage.JAVA_VARIABLES__FIELDS:
-				getFields().clear();
-				return;
-			case CbcmodelPackage.JAVA_VARIABLES__PARAMS:
-				getParams().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case CbcmodelPackage.JAVA_VARIABLES__VARIABLES:
-				return variables != null && !variables.isEmpty();
-			case CbcmodelPackage.JAVA_VARIABLES__FIELDS:
-				return fields != null && !fields.isEmpty();
-			case CbcmodelPackage.JAVA_VARIABLES__PARAMS:
-				return params != null && !params.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-=======
-/**
- */
-package de.tu_bs.cs.isf.cbc.cbcmodel.impl;
-
-import de.tu_bs.cs.isf.cbc.cbcclass.Field;
-import de.tu_bs.cs.isf.cbc.cbcclass.Method;
-import de.tu_bs.cs.isf.cbc.cbcclass.ModelClass;
-import de.tu_bs.cs.isf.cbc.cbcclass.Parameter;
-import de.tu_bs.cs.isf.cbc.cbcmodel.CbcmodelPackage;
-import de.tu_bs.cs.isf.cbc.cbcmodel.JavaVariable;
-import de.tu_bs.cs.isf.cbc.cbcmodel.JavaVariables;
-import java.util.Collection;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Java Variables</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link de.tu_bs.cs.isf.cbc.cbcmodel.impl.JavaVariablesImpl#getVariables <em>Variables</em>}</li>
- *   <li>{@link de.tu_bs.cs.isf.cbc.cbcmodel.impl.JavaVariablesImpl#getFields <em>Fields</em>}</li>
- *   <li>{@link de.tu_bs.cs.isf.cbc.cbcmodel.impl.JavaVariablesImpl#getParams <em>Params</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class JavaVariablesImpl extends MinimalEObjectImpl.Container implements JavaVariables {
-	/**
-	 * The cached value of the '{@link #getVariables() <em>Variables</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVariables()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<JavaVariable> variables;
-
-	/**
-	 * The cached value of the '{@link #getFields() <em>Fields</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFields()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<Field> fields;
-
-	/**
-	 * The cached value of the '{@link #getParams() <em>Params</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getParams()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<Parameter> params;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected JavaVariablesImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return CbcmodelPackage.Literals.JAVA_VARIABLES;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EList<JavaVariable> getVariables() {
-		if (variables == null) {
-			variables = new EObjectContainmentEList<JavaVariable>(JavaVariable.class, this, CbcmodelPackage.JAVA_VARIABLES__VARIABLES);
-		}
-		return variables;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	@Override
-	public EList<Field> getFields() {
-		if (eDirectResource() != null) {
-			if (eDirectResource().getResourceSet() != null) {
-				if (eDirectResource().getResourceSet().getResources() != null) {
-					EList<Resource> resources = eDirectResource().getResourceSet().getResources();
-					URI uri = eDirectResource().getURI();
-					uri = uri.trimSegments(1);
-					uri = uri.appendSegment(uri.lastSegment() + ".cbcclass");
-					for (Resource res : resources) {
-						if (res.getURI().equals(uri)) {
-							EList<EObject> content = res.getContents();
-							for (EObject o : content) {
-								if (o instanceof ModelClass) {
-									return ((ModelClass) o).getFields();
-								}
-							}
-						}
-					}
-				}
-			}
-		}	
-		if (fields == null) {
-			fields = new EObjectResolvingEList<Field>(Field.class, this, CbcmodelPackage.JAVA_VARIABLES__FIELDS);
-		}
-		return fields;
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	@Override
-	public EList<Parameter> getParams() {
-		if (eDirectResource() != null) {
-			String methodName = eDirectResource().getURI().trimFileExtension().lastSegment();
-			if (eDirectResource().getResourceSet() != null) {
-				if (eDirectResource().getResourceSet().getResources() != null) {
-					EList<Resource> resources = eDirectResource().getResourceSet().getResources();
-					URI uri = eDirectResource().getURI();
-					uri = uri.trimSegments(1);
-					uri = uri.appendSegment(uri.lastSegment() + ".cbcclass");
-					for (Resource res : resources) {
-						if (res.getURI().equals(uri) || res.getURI().toString().endsWith(uri.toString().replace("platform:/resource",""))) {
-							EList<EObject> content = res.getContents();
-							for (EObject o : content) {
-								if (o instanceof ModelClass) {
-									ModelClass mc = (ModelClass) o;
-									for (Method method : mc.getMethods()) {
-										if (method.getName().equals(methodName)) {
-											return method.getParameters();
-										}
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-		if (params == null) {
-			params = new EObjectResolvingEList<Parameter>(Parameter.class, this, CbcmodelPackage.JAVA_VARIABLES__PARAMS);
-		}
-		return params;	
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case CbcmodelPackage.JAVA_VARIABLES__VARIABLES:
-				return ((InternalEList<?>)getVariables()).basicRemove(otherEnd, msgs);
-			case CbcmodelPackage.JAVA_VARIABLES__PARAMS:
-				return ((InternalEList<?>)getParams()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case CbcmodelPackage.JAVA_VARIABLES__VARIABLES:
-				return getVariables();
-			case CbcmodelPackage.JAVA_VARIABLES__FIELDS:
-				return getFields();
-			case CbcmodelPackage.JAVA_VARIABLES__PARAMS:
-				return getParams();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case CbcmodelPackage.JAVA_VARIABLES__VARIABLES:
-				getVariables().clear();
-				getVariables().addAll((Collection<? extends JavaVariable>)newValue);
-				return;
-			case CbcmodelPackage.JAVA_VARIABLES__FIELDS:
-				getFields().clear();
-				getFields().addAll((Collection<? extends Field>)newValue);
-				return;
-			case CbcmodelPackage.JAVA_VARIABLES__PARAMS:
-				getParams().clear();
-				getParams().addAll((Collection<? extends Parameter>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case CbcmodelPackage.JAVA_VARIABLES__VARIABLES:
-				getVariables().clear();
-				return;
-			case CbcmodelPackage.JAVA_VARIABLES__FIELDS:
-				getFields().clear();
-				return;
-			case CbcmodelPackage.JAVA_VARIABLES__PARAMS:
-				getParams().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case CbcmodelPackage.JAVA_VARIABLES__VARIABLES:
-				return variables != null && !variables.isEmpty();
-			case CbcmodelPackage.JAVA_VARIABLES__FIELDS:
-				return fields != null && !fields.isEmpty();
-			case CbcmodelPackage.JAVA_VARIABLES__PARAMS:
-				return params != null && !params.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
->>>>>>> master
-} //JavaVariablesImpl
\ No newline at end of file
diff --git a/de.tu-bs.cs.isf.cbc.mutation/.project.orig b/de.tu-bs.cs.isf.cbc.mutation/.project.orig
deleted file mode 100644
index 9332e07c0..000000000
--- a/de.tu-bs.cs.isf.cbc.mutation/.project.orig
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>de.tu-bs.cs.isf.cbc.mutation</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/de.tu-bs.cs.isf.cbc.mutation/build.properties.orig b/de.tu-bs.cs.isf.cbc.mutation/build.properties.orig
deleted file mode 100644
index 61c689bda..000000000
--- a/de.tu-bs.cs.isf.cbc.mutation/build.properties.orig
+++ /dev/null
@@ -1,6 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               muJava/openjava.jar,\
-               plugin.xml
diff --git a/de.tu-bs.cs.isf.cbc.tool/.classpath.orig b/de.tu-bs.cs.isf.cbc.tool/.classpath.orig
deleted file mode 100644
index c91aa6381..000000000
--- a/de.tu-bs.cs.isf.cbc.tool/.classpath.orig
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-<<<<<<< HEAD
-=======
-	<classpathentry kind="src" path="src"/>
->>>>>>> master
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
-		<attributes>
-			<attribute name="module" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-<<<<<<< HEAD
-	<classpathentry kind="src" path="src"/>
-=======
-	<classpathentry exported="true" kind="lib" path="lib/com.microsoft.z3.jar"/>
-	<classpathentry kind="con" path="org.testng.TESTNG_CONTAINER"/>
->>>>>>> master
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/de.tu-bs.cs.isf.cbc.tool/META-INF/MANIFEST.MF.orig b/de.tu-bs.cs.isf.cbc.tool/META-INF/MANIFEST.MF.orig
deleted file mode 100644
index b83189b4b..000000000
--- a/de.tu-bs.cs.isf.cbc.tool/META-INF/MANIFEST.MF.orig
+++ /dev/null
@@ -1,64 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Tool
-Bundle-SymbolicName: de.tu-bs.cs.isf.cbc.tool;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-16,
- JavaSE-1.8
-Require-Bundle: org.eclipse.graphiti,
- org.eclipse.graphiti.ui,
- org.eclipse.ui.views.properties.tabbed,
- org.eclipse.graphiti.pattern,
- org.eclipse.emf.transaction,
- org.eclipse.xtext;bundle-version="2.10.0",
- org.eclipse.draw2d;bundle-version="3.10.100",
- org.emftext.language.java,
-<<<<<<< HEAD
- org.eclipse.jdt.core,
- de.tu_bs.cs.isf.cbc.cbcclass.model,
- de.tu_bs.cs.isf.cbc.statistics,
- org.eclipse.graphiti.mm,
- org.eclipse.swt,
- de.ovgu.featureide.fm.core,
- org.eclipse.mylyn.commons.ui,
- org.eclipse.ui.workbench,
- org.eclipse.core.commands
-Import-Package: de.tu_bs.cs.isf.cbc.cbcclass.model.cbcclass,
- de.tu_bs.cs.isf.cbcclass.tool.patterns,
- helper,
- org.eclipse.jdt.core.dom,
- org.emftext.language.java.resource.java.util,
- de.ovgu.featureide.fm.core.base,
- de.ovgu.featureide.fm.core.io.manager,
- org.eclipse.compare.internal,
- org.eclipse.emf.common.ui,
- org.eclipse.jdt.core
-Export-Package: de.tu_bs.cs.isf.cbc.tool.diagram,
- de.tu_bs.cs.isf.cbc.tool.features,
- de.tu_bs.cs.isf.cbc.tool.helper,
- de.tu_bs.cs.isf.cbc.tool.model,
- de.tu_bs.cs.isf.cbc.tool.patterns 
-=======
- de.ovgu.featureide.fm.core,
- org.eclipse.mylyn.commons.ui,
- org.testng;bundle-version="7.4.0",
- de.tu-bs.cs.isf.cbc.util;bundle-version="1.0.0"
-Import-Package: de.ovgu.featureide.fm.core.base,
- de.ovgu.featureide.fm.core.io.manager,
- de.tu_bs.cs.isf.cbc.cbcclass,
- de.tu_bs.cs.isf.cbc.cbcmodel,
- de.tu_bs.cs.isf.cbc.cbcmodel.impl,
- de.tu_bs.cs.isf.cbc.exceptions,
- de.tu_bs.cs.isf.cbc.parser.exceptions,
- de.tu_bs.cs.isf.cbc.statistics,
- de.tu_bs.cs.isf.commands.toolbar.handler.family,
- de.tu_bs.cs.isf.lattice,
- org.eclipse.emf.common.ui
-Export-Package: de.tu_bs.cs.isf.cbc.tool.diagram,
- de.tu_bs.cs.isf.cbc.tool.features,
- de.tu_bs.cs.isf.cbc.tool.helper,
- de.tu_bs.cs.isf.cbc.tool.patterns,
- de.tu_bs.cs.isf.cbc.tool.propertiesview
-Bundle-ClassPath: lib/com.microsoft.z3.jar,
- .
->>>>>>> master
diff --git a/de.tu-bs.cs.isf.cbc.tool/build.properties.orig b/de.tu-bs.cs.isf.cbc.tool/build.properties.orig
deleted file mode 100644
index 7e967f047..000000000
--- a/de.tu-bs.cs.isf.cbc.tool/build.properties.orig
+++ /dev/null
@@ -1,11 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-<<<<<<< HEAD
-               icons/
-=======
-               icons/,\
-               lib/com.microsoft.z3.jar
->>>>>>> master
diff --git a/de.tu-bs.cs.isf.cbc.tool/plugin.xml.orig b/de.tu-bs.cs.isf.cbc.tool/plugin.xml.orig
deleted file mode 100644
index 7e8a4a288..000000000
--- a/de.tu-bs.cs.isf.cbc.tool/plugin.xml.orig
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-   <extension
-         point="org.eclipse.graphiti.ui.diagramTypes">
-      <diagramType
-            id="de.tu-bs.cs.isf.cbc.tool.diagramType"
-            name="CbC Diagram"
-            type="cbc">
-      </diagramType>
-   </extension>
-   <extension
-         point="org.eclipse.graphiti.ui.diagramTypeProviders">
-      <diagramTypeProvider
-            class="de.tu_bs.cs.isf.cbc.tool.diagram.CbCDiagramTypeProvider"
-            context="org.eclipse.graphiti.ui.diagramEditor"
-            id="de.tu-bs.cs.isf.cbc.tool.CbCDiagramTypeProvider"
-            name="CbC Diagram Type Provider">
-         <diagramType
-               id="de.tu-bs.cs.isf.cbc.tool.diagramType">
-         </diagramType>
-         <imageProvider
-               id="de.tu-bs.cs.isf.cbc.tool.imageProvider">
-         </imageProvider>
-      </diagramTypeProvider>
-   </extension>
-   <extension
-         point="org.eclipse.graphiti.ui.imageProviders">
-      <imageProvider
-            class="de.tu_bs.cs.isf.cbc.tool.diagram.CbCImageProvider"
-            id="de.tu-bs.cs.isf.cbc.tool.imageProvider">
-      </imageProvider>
-   </extension>
-   <extension
-    point="org.eclipse.ui.views.properties.tabbed.propertyContributor">
-    <propertyContributor contributorId="cbc.PropertyContributor">
-        <propertyCategory category="Graphiti">
-        </propertyCategory>
-    </propertyContributor>
-</extension>
-      
-<extension
-      point="org.eclipse.ui.views.properties.tabbed.propertyTabs">
-   <propertyTabs
-          contributorId="cbc.PropertyContributor">
-    <propertyTab
-         category="Graphiti"
-<<<<<<< HEAD
-=======
-         id="Settings"
-         label="Settings">
-    </propertyTab>
-    <propertyTab
-         category="Graphiti"
-         id="Testing"
-         label="Testing">
-    </propertyTab>
-    <propertyTab
-         category="Graphiti"
->>>>>>> master
-         id="Configurations"
-         label="Configurations">
-    </propertyTab>
-    <propertyTab
-         category="Graphiti"
-         id="Replacements"
-         label="Replacements">
-    </propertyTab>
-    <propertyTab
-         category="Graphiti"
-         id="CodeReader"
-         label="Code Reader">
-    </propertyTab>
-    <propertyTab
-         category="Graphiti"
-         id="Inheritance"
-         label="Inheritance">
-    </propertyTab>
-    <propertyTab
-         category="Graphiti"
-         id="Basics"
-         label="Basics">
-    </propertyTab>
-<<<<<<< HEAD
-=======
-    <propertyTab
-          category="Graphiti"
-          id="IFbC"
-          label="IFbC">
-    </propertyTab>
-    <propertyTab
-          category="Graphiti"
-          id="Variables"
-          label="Variables">
-    </propertyTab>
->>>>>>> master
-   </propertyTabs>
-</extension>
-<extension
-      point="org.eclipse.ui.views.properties.tabbed.propertySections">
-    <propertySections
-          contributorId="cbc.PropertyContributor">
-        <propertySection
-<<<<<<< HEAD
-=======
-              class="de.tu_bs.cs.isf.cbc.tool.propertiesview.SettingsSection"
-              filter="de.tu_bs.cs.isf.cbc.tool.propertiesview.PictogramFilterCodeReader"
-              id="Settings"
-              tab="Settings">
-        </propertySection>
-        <propertySection
-              class="de.tu_bs.cs.isf.cbc.tool.propertiesview.TestSection"
-              filter="de.tu_bs.cs.isf.cbc.tool.propertiesview.PictogramFilterCodeReader"
-              id="Testing"
-              tab="Testing">
-        </propertySection>
-        <propertySection
->>>>>>> master
-              afterSection="Replacements"
-              class="de.tu_bs.cs.isf.cbc.tool.propertiesview.ConfigurationsSection"
-              filter="de.tu_bs.cs.isf.cbc.tool.propertiesview.PictogramFilterVariational"
-              id="Configurations"
-              tab="Configurations">
-        </propertySection>
-        <propertySection
-              afterSection="CodeReader"
-              class="de.tu_bs.cs.isf.cbc.tool.propertiesview.ReplacementsSection"
-              filter="de.tu_bs.cs.isf.cbc.tool.propertiesview.PictogramFilterVariational"
-              id="Replacements"
-              tab="Replacements">
-        </propertySection>
-        <propertySection
-              afterSection="Inheritance"
-              class="de.tu_bs.cs.isf.cbc.tool.propertiesview.CodeReaderSection"
-              filter="de.tu_bs.cs.isf.cbc.tool.propertiesview.PictogramFilterCodeReader"
-              id="CodeReader"
-              tab="CodeReader">
-        </propertySection>
-        <propertySection
-              afterSection="Basics"
-              class="de.tu_bs.cs.isf.cbc.tool.propertiesview.InheritanceSection"
-              filter="de.tu_bs.cs.isf.cbc.tool.propertiesview.PictogramFilter"
-              id="Inheritance"
-              tab="Inheritance">
-        </propertySection>
-        <propertySection
-              class="de.tu_bs.cs.isf.cbc.tool.propertiesview.BasicsSection"
-              filter="de.tu_bs.cs.isf.cbc.tool.propertiesview.PictogramFilter"
-              id="Basics"
-              tab="Basics">
-        </propertySection>
-<<<<<<< HEAD
-=======
-        <propertySection
-              afterSection="CodeReader"
-              class="de.tu_bs.cs.isf.cbc.tool.propertiesview.IFbCSection"
-              filter="de.tu_bs.cs.isf.cbc.tool.propertiesview.IFbCFilter"
-              id="IFbC"
-              tab="IFbC">
-        </propertySection>
-        <propertySection
-              afterSection="Basics"
-              class="de.tu_bs.cs.isf.cbc.tool.propertiesview.VariableSection"
-              filter="de.tu_bs.cs.isf.cbc.tool.propertiesview.VariableFilter"
-              id="Variables"
-              tab="Variables">
-        </propertySection>
->>>>>>> master
-    </propertySections>
-</extension>
-<extension
-         point="org.eclipse.ui.decorators">
-      <decorator
-            adaptable="true"
-            class="de.tu_bs.cs.isf.cbc.tool.diagram.CbCDiagramDecorator"
-            id="de.tu-bs.cs.isf.cbc.tool.cbcDiagramDecorator"
-            label="CbCDiagramDecorator"
-            location="BOTTOM_LEFT"
-            state="true">
-      </decorator>
-   </extension>
-<<<<<<< HEAD
-</plugin>
-=======
-</plugin>
->>>>>>> master
diff --git a/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/diagram/CbCFeatureProvider.java.orig b/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/diagram/CbCFeatureProvider.java.orig
deleted file mode 100644
index 330964042..000000000
--- a/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/diagram/CbCFeatureProvider.java.orig
+++ /dev/null
@@ -1,200 +0,0 @@
-package de.tu_bs.cs.isf.cbc.tool.diagram;
-
-import org.eclipse.graphiti.dt.IDiagramTypeProvider;
-import org.eclipse.graphiti.features.ICreateFeature;
-import org.eclipse.graphiti.features.IDeleteFeature;
-import org.eclipse.graphiti.features.IReconnectionFeature;
-import org.eclipse.graphiti.features.context.ICustomContext;
-import org.eclipse.graphiti.features.context.IDeleteContext;
-import org.eclipse.graphiti.features.context.IReconnectionContext;
-import org.eclipse.graphiti.features.custom.ICustomFeature;
-import org.eclipse.graphiti.mm.pictograms.Connection;
-import org.eclipse.graphiti.pattern.DefaultFeatureProviderWithPatterns;
-
-import de.tu_bs.cs.isf.cbc.tool.features.ChangeNameOfAssociatedClassFeature;
-import de.tu_bs.cs.isf.cbc.tool.features.ChangeNameOfAssociatedMethodFeature;
-import de.tu_bs.cs.isf.cbc.tool.features.ChangeNameOfFormulaFeature;
-import de.tu_bs.cs.isf.cbc.tool.features.CreateExtraSelectionFeature;
-import de.tu_bs.cs.isf.cbc.tool.features.DeleteConnectionFeature;
-import de.tu_bs.cs.isf.cbc.tool.features.EditCommentFeature;
-import de.tu_bs.cs.isf.cbc.tool.features.EditCompositionTechniqueOfFormula;
-import de.tu_bs.cs.isf.cbc.tool.features.ExtractMethodStubsFeature;
-import de.tu_bs.cs.isf.cbc.tool.features.GenerateIntermediateConditionFeature;
-import de.tu_bs.cs.isf.cbc.tool.features.GenerateIntermediateConditionFeature2;
-import de.tu_bs.cs.isf.cbc.tool.features.GenerateTextualRepresentation;
-import de.tu_bs.cs.isf.cbc.tool.features.LayoutFeature;
-import de.tu_bs.cs.isf.cbc.tool.features.ReconnectionFeature;
-import de.tu_bs.cs.isf.cbc.tool.features.RenameConditionFeature;
-import de.tu_bs.cs.isf.cbc.tool.features.RenameRenamingFeature;
-import de.tu_bs.cs.isf.cbc.tool.features.RenameStatementFeature;
-import de.tu_bs.cs.isf.cbc.tool.features.RenameVariableFeature;
-import de.tu_bs.cs.isf.cbc.tool.features.RenameVariantFeature;
-import de.tu_bs.cs.isf.cbc.tool.features.ShowKeyFileFeature;
-<<<<<<< HEAD
-import de.tu_bs.cs.isf.cbc.tool.features.UpdateDiagramFeature;
-=======
-import de.tu_bs.cs.isf.cbc.tool.features.TestAllStatements;
-import de.tu_bs.cs.isf.cbc.tool.features.TestAndAssertionGenerator;
-import de.tu_bs.cs.isf.cbc.tool.features.TestStatement;
-import de.tu_bs.cs.isf.cbc.tool.features.UpdateDiagramFeature;
-import de.tu_bs.cs.isf.cbc.tool.features.UpdateInformationFlowFeature;
->>>>>>> master
-import de.tu_bs.cs.isf.cbc.tool.features.VerifyAllStatements;
-import de.tu_bs.cs.isf.cbc.tool.features.VerifyMethodCallStatement;
-import de.tu_bs.cs.isf.cbc.tool.features.VerifyOriginalCallStatement;
-import de.tu_bs.cs.isf.cbc.tool.features.VerifyPostRepetitionStatement;
-import de.tu_bs.cs.isf.cbc.tool.features.VerifyPreRepetitionStatement;
-import de.tu_bs.cs.isf.cbc.tool.features.VerifyPreSelectionStatement;
-import de.tu_bs.cs.isf.cbc.tool.features.VerifyStatement;
-import de.tu_bs.cs.isf.cbc.tool.features.VerifyStatementInlining;
-import de.tu_bs.cs.isf.cbc.tool.features.VerifyStrengthWeakCorrect;
-import de.tu_bs.cs.isf.cbc.tool.features.VerifyVariantWithInnerLoops;
-import de.tu_bs.cs.isf.cbc.tool.features.VerifyVariantWithoutInnerLoops;
-import de.tu_bs.cs.isf.cbc.tool.features.intermediate.AboveCompositionFirstFeature;
-import de.tu_bs.cs.isf.cbc.tool.features.intermediate.AboveCompositionSecondFeature;
-import de.tu_bs.cs.isf.cbc.tool.features.intermediate.AboveRepetitionFeature;
-import de.tu_bs.cs.isf.cbc.tool.features.intermediate.AboveSelectionFeature;
-import de.tu_bs.cs.isf.cbc.tool.features.intermediate.BelowImplementationFeature;
-import de.tu_bs.cs.isf.cbc.tool.helper.GenerateCodeFromModel;
-import de.tu_bs.cs.isf.cbc.tool.patterns.CompositionPattern;
-import de.tu_bs.cs.isf.cbc.tool.patterns.ConditionPattern;
-import de.tu_bs.cs.isf.cbc.tool.patterns.ConnectionPattern;
-<<<<<<< HEAD
-=======
-import de.tu_bs.cs.isf.cbc.tool.patterns.FieldPattern;
->>>>>>> master
-import de.tu_bs.cs.isf.cbc.tool.patterns.FormulaPattern;
-import de.tu_bs.cs.isf.cbc.tool.patterns.GlobalConditionsPattern;
-import de.tu_bs.cs.isf.cbc.tool.patterns.MethodStatementPattern;
-import de.tu_bs.cs.isf.cbc.tool.patterns.OriginalStatementPattern;
-<<<<<<< HEAD
-=======
-import de.tu_bs.cs.isf.cbc.tool.patterns.ParameterPattern;
->>>>>>> master
-//import de.tu_bs.cs.isf.cbc.tool.patterns.MethodStatementPattern;
-//import de.tu_bs.cs.isf.cbc.tool.patterns.OriginalStatementPattern;
-import de.tu_bs.cs.isf.cbc.tool.patterns.RenamePattern;
-import de.tu_bs.cs.isf.cbc.tool.patterns.RenamingPattern;
-import de.tu_bs.cs.isf.cbc.tool.patterns.ReturnPattern;
-import de.tu_bs.cs.isf.cbc.tool.patterns.SelectionPattern;
-import de.tu_bs.cs.isf.cbc.tool.patterns.SkipStatementPattern;
-import de.tu_bs.cs.isf.cbc.tool.patterns.SmallRepetitionPattern;
-import de.tu_bs.cs.isf.cbc.tool.patterns.StatementPattern;
-import de.tu_bs.cs.isf.cbc.tool.patterns.StrengthWeakStatementPattern;
-import de.tu_bs.cs.isf.cbc.tool.patterns.VariablePattern;
-import de.tu_bs.cs.isf.cbc.tool.patterns.VariablesPattern;
-import de.tu_bs.cs.isf.cbc.tool.patterns.VariantPattern;
-
-public class CbCFeatureProvider extends DefaultFeatureProviderWithPatterns {
-
-	public CbCFeatureProvider(IDiagramTypeProvider dtp) {
-		super(dtp);
-		addPattern(new FormulaPattern());
-		addPattern(new OriginalStatementPattern());
-		addPattern(new CompositionPattern());
-		addPattern(new SelectionPattern());
-		addPattern(new SmallRepetitionPattern());
-		addPattern(new SkipStatementPattern());
-		addPattern(new MethodStatementPattern());
-		addPattern(new ReturnPattern());
-		addPattern(new StrengthWeakStatementPattern());
-		addPattern(new StatementPattern());
-		addPattern(new GlobalConditionsPattern());
-		addPattern(new ConditionPattern());
-		addPattern(new VariablesPattern());
-		addPattern(new VariablePattern());
-		addPattern(new RenamingPattern());
-		addPattern(new RenamePattern());
-<<<<<<< HEAD
-=======
-		addPattern(new FieldPattern()); //this one is remove by getCreateFeatures() below
-		addPattern(new ParameterPattern()); //this one is remove by getCreateFeatures() below
->>>>>>> master
-		addPattern(new VariantPattern()); //this one is remove by getCreateFeatures() below
-		addConnectionPattern(new ConnectionPattern());
-	}
-
-	@Override
-	public ICreateFeature[] getCreateFeatures() {
-		ICreateFeature[] oldArray = super.getCreateFeatures();
-<<<<<<< HEAD
-		ICreateFeature[] array = new ICreateFeature[oldArray.length];
-		for (int i = 0; i < oldArray.length; i++) {
-			array[i] = oldArray[i];
-		}
-		array[array.length - 1] = new CreateExtraSelectionFeature(this);
-=======
-		ICreateFeature[] array = new ICreateFeature[oldArray.length-2];//remove the last two from above
-		for (int i = 0; i < array.length; i++) {
-			array[i] = oldArray[i];
-		}
-		array[array.length - 1] = new CreateExtraSelectionFeature(this);//replace the third last with ExtraSelection
->>>>>>> master
-		return array;
-	}
-
-	@Override
-	public IReconnectionFeature getReconnectionFeature(IReconnectionContext context) {
-		return new ReconnectionFeature(this);
-	}
-
-	@Override
-	public IDeleteFeature getDeleteFeature(IDeleteContext context) {
-		if (context.getPictogramElement() instanceof Connection) {
-			return new DeleteConnectionFeature(this);
-		}
-		return super.getDeleteFeature(context);
-	}
-
-	@Override
-	public ICustomFeature[] getCustomFeatures(ICustomContext context) {
-		return new ICustomFeature[] { 
-				new ExtractMethodStubsFeature(this), //!
-				new GenerateCodeFromModel(this),
-<<<<<<< HEAD
-				new GenerateTextualRepresentation(this), 
-=======
-				new GenerateTextualRepresentation(this), 	
-				new TestAllStatements(this),
-				new TestStatement(this),
-	    		new TestAndAssertionGenerator(this),
->>>>>>> master
-				new VerifyStatement(this),
-				new VerifyOriginalCallStatement(this),
-				new VerifyMethodCallStatement(this),
-				new VerifyPreRepetitionStatement(this), 
-				new VerifyPostRepetitionStatement(this),
-				new VerifyPreSelectionStatement(this), 
-				new VerifyStrengthWeakCorrect(this),
-				new VerifyVariantWithInnerLoops(this), 
-				new VerifyVariantWithoutInnerLoops(this), //!
-				new EditCommentFeature(this),
-				new EditCompositionTechniqueOfFormula(this), //!
-				new ChangeNameOfFormulaFeature(this),
-				new RenameStatementFeature(this), 
-				new RenameConditionFeature(this), 
-				new RenameVariantFeature(this),
-				new RenameVariableFeature(this), 
-				new RenameRenamingFeature(this),
-				new LayoutFeature(this), 
-				new GenerateIntermediateConditionFeature(this), 
-				new GenerateIntermediateConditionFeature2(this),
-	    		new ChangeNameOfAssociatedClassFeature(this),
-	    		new ChangeNameOfAssociatedMethodFeature(this),
-	    		new AboveCompositionFirstFeature(this),
-	    		new AboveCompositionSecondFeature(this),
-	    		new AboveSelectionFeature(this),
-	    		new AboveRepetitionFeature(this),
-	    		new BelowImplementationFeature(this),
-	    		new VerifyAllStatements(this),
-				new VerifyStatementInlining(this),
-<<<<<<< HEAD
-	    		new UpdateDiagramFeature(this),
-				new ShowKeyFileFeature(this)};
-=======
-	    		new UpdateDiagramFeature(this),	    		
-				new ShowKeyFileFeature(this),
-	    		new UpdateInformationFlowFeature(this)};
->>>>>>> master
-	}
-}
\ No newline at end of file
diff --git a/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/diagram/CbCToolBehaviorProvider.java.orig b/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/diagram/CbCToolBehaviorProvider.java.orig
deleted file mode 100644
index a8f91b1c8..000000000
--- a/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/diagram/CbCToolBehaviorProvider.java.orig
+++ /dev/null
@@ -1,233 +0,0 @@
-package de.tu_bs.cs.isf.cbc.tool.diagram;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.graphiti.dt.IDiagramTypeProvider;
-import org.eclipse.graphiti.features.ICreateConnectionFeature;
-import org.eclipse.graphiti.features.ICreateFeature;
-import org.eclipse.graphiti.features.IFeatureProvider;
-import org.eclipse.graphiti.features.context.ICustomContext;
-import org.eclipse.graphiti.features.context.IDoubleClickContext;
-import org.eclipse.graphiti.features.context.IPictogramElementContext;
-import org.eclipse.graphiti.features.custom.ICustomFeature;
-import org.eclipse.graphiti.mm.algorithms.GraphicsAlgorithm;
-import org.eclipse.graphiti.mm.pictograms.ContainerShape;
-import org.eclipse.graphiti.mm.pictograms.PictogramElement;
-import org.eclipse.graphiti.palette.IPaletteCompartmentEntry;
-import org.eclipse.graphiti.palette.impl.ConnectionCreationToolEntry;
-import org.eclipse.graphiti.palette.impl.ObjectCreationToolEntry;
-import org.eclipse.graphiti.palette.impl.PaletteCompartmentEntry;
-import org.eclipse.graphiti.tb.ContextMenuEntry;
-import org.eclipse.graphiti.tb.DefaultToolBehaviorProvider;
-import org.eclipse.graphiti.tb.IContextButtonPadData;
-import org.eclipse.graphiti.tb.IContextMenuEntry;
-import org.eclipse.graphiti.tb.IToolBehaviorProvider;
-<<<<<<< HEAD
-import de.tu_bs.cs.isf.cbc.cbcclass.model.cbcclass.Method;
-=======
-import de.tu_bs.cs.isf.cbc.cbcclass.Method;
->>>>>>> master
-import de.tu_bs.cs.isf.cbc.cbcmodel.AbstractStatement;
-import de.tu_bs.cs.isf.cbc.cbcmodel.CbCFormula;
-import de.tu_bs.cs.isf.cbc.cbcmodel.SelectionStatement;
-import de.tu_bs.cs.isf.cbc.cbcmodel.impl.AbstractStatementImpl;
-import de.tu_bs.cs.isf.cbc.tool.features.RenameConditionFeature;
-import de.tu_bs.cs.isf.cbc.tool.features.RenameRenamingFeature;
-import de.tu_bs.cs.isf.cbc.tool.features.RenameStatementFeature;
-import de.tu_bs.cs.isf.cbc.tool.features.RenameVariableFeature;
-import de.tu_bs.cs.isf.cbc.tool.features.RenameVariantFeature;
-
-/**
- * Own implementation of a ToolBehaviorProvider
- * 
- * @author Tobias
- *
- */
-public class CbCToolBehaviorProvider extends DefaultToolBehaviorProvider implements IToolBehaviorProvider {
-
-	/**
-	 * Constructor of the class
-	 * 
-	 * @param diagramTypeProvider
-	 *            The DiagramTypeProvider
-	 */
-	public CbCToolBehaviorProvider(IDiagramTypeProvider diagramTypeProvider) {
-		super(diagramTypeProvider);
-	}	
-	
-	@Override
-	public IContextButtonPadData getContextButtonPad(IPictogramElementContext context) {
-		IContextButtonPadData data = super.getContextButtonPad(context);
-		PictogramElement pe = context.getPictogramElement();
-		boolean notDelete = false;
-
-		if (pe.getLink().getBusinessObjects() != null) {
-			for (EObject object : pe.getLink().getBusinessObjects()) {
-				if (object.getClass().equals(AbstractStatementImpl.class) && !(pe instanceof ContainerShape)) {
-					AbstractStatement statement = (AbstractStatement) object;
-					if (!(statement.eContainer() instanceof SelectionStatement)) {
-						notDelete = true;
-					}
-				}
-			}
-		}
-		if (notDelete) {
-			setGenericContextButtons(data, pe, CONTEXT_BUTTON_UPDATE);
-		} else {
-			setGenericContextButtons(data, pe, CONTEXT_BUTTON_DELETE | CONTEXT_BUTTON_UPDATE);
-		}
-
-		return data;
-	}
-
-	@Override
-	public ICustomFeature getDoubleClickFeature(IDoubleClickContext context) {
-		ICustomFeature customFeature = new RenameStatementFeature(getFeatureProvider());
-		if (customFeature.canExecute(context)) {
-			return customFeature;
-		}
-		customFeature = new RenameConditionFeature(getFeatureProvider());
-		if (customFeature.canExecute(context)) {
-			return customFeature;
-		}
-		customFeature = new RenameVariantFeature(getFeatureProvider());
-		if (customFeature.canExecute(context)) {
-			return customFeature;
-		}
-		customFeature = new RenameVariableFeature(getFeatureProvider());
-		if (customFeature.canExecute(context)) {
-			return customFeature;
-		}
-		customFeature = new RenameRenamingFeature(getFeatureProvider());
-		if (customFeature.canExecute(context)) {
-			return customFeature;
-		}
-		return super.getDoubleClickFeature(context);
-	}
-
-	@Override
-	public IContextMenuEntry[] getContextMenu(ICustomContext context) {
-		// create a sub-menu for all custom features
-<<<<<<< HEAD
-=======
-		ContextMenuEntry subMenuTest = new ContextMenuEntry(null, context);
-		subMenuTest.setText("Test");
-		subMenuTest.setDescription("Test features submenu");
-		// display sub-menu hierarchical or flat
-		subMenuTest.setSubmenu(true);
-		
->>>>>>> master
-		ContextMenuEntry subMenuVerify = new ContextMenuEntry(null, context);
-		subMenuVerify.setText("Verify");
-		subMenuVerify.setDescription("Verify features submenu");
-		// display sub-menu hierarchical or flat
-		subMenuVerify.setSubmenu(true);
-
-		ContextMenuEntry subMenuPrint = new ContextMenuEntry(null, context);
-		subMenuPrint.setText("Edit");
-		subMenuPrint.setDescription("Generate features submenu");
-		// display sub-menu hierarchical or flat
-		subMenuPrint.setSubmenu(true);
-
-		// create a menu-entry in the sub-menu for each custom feature
-		ICustomFeature[] customFeatures = getFeatureProvider().getCustomFeatures(context);
-		for (int i = 0; i < customFeatures.length; i++) {
-			ICustomFeature customFeature = customFeatures[i];
-			if (customFeature.canExecute(context)) {
-<<<<<<< HEAD
-				if (customFeature.getName().contains("Verify")) {
-=======
-				if (customFeature.getName().contains("Test") || customFeature.getName().contains("test")) {
-					ContextMenuEntry menuEntry = new ContextMenuEntry(customFeature, context);
-					subMenuTest.add(menuEntry);
-				} else if (customFeature.getName().contains("Verify")) {
->>>>>>> master
-					ContextMenuEntry menuEntry = new ContextMenuEntry(customFeature, context);
-					subMenuVerify.add(menuEntry);
-				} else {
-					ContextMenuEntry menuEntry = new ContextMenuEntry(customFeature, context);
-					subMenuPrint.add(menuEntry);
-				}
-			}
-		}
-
-<<<<<<< HEAD
-		IContextMenuEntry ret[] = new IContextMenuEntry[] { subMenuVerify, subMenuPrint };
-=======
-		IContextMenuEntry ret[] = new IContextMenuEntry[] { subMenuTest, subMenuVerify, subMenuPrint };
->>>>>>> master
-		return ret;
-	}
-
-	@Override
-	public IPaletteCompartmentEntry[] getPalette() {
-		List<IPaletteCompartmentEntry> ret = new ArrayList<IPaletteCompartmentEntry>();
-
-		// add new compartment at the end of the existing compartments
-		PaletteCompartmentEntry compartmentStatementEntry = new PaletteCompartmentEntry("Statements", null);
-		ret.add(compartmentStatementEntry);
-
-		PaletteCompartmentEntry compartmentOtherEntry = new PaletteCompartmentEntry("Other", null);
-		ret.add(compartmentOtherEntry);
-
-		PaletteCompartmentEntry compartmentConnectionEntry = new PaletteCompartmentEntry("Connections", null);
-		ret.add(compartmentConnectionEntry);
-
-		// add all create-features to the new stack-entry
-		IFeatureProvider featureProvider = getFeatureProvider();
-		ICreateFeature[] createFeatures = featureProvider.getCreateFeatures();
-		for (ICreateFeature cf : createFeatures) {
-			ObjectCreationToolEntry objectCreationToolEntry = new ObjectCreationToolEntry(cf.getCreateName(), cf.getCreateDescription(), cf.getCreateImageId(), cf.getCreateLargeImageId(), cf);
-			if (cf.getCreateName().contains("Variable")
-					|| cf.getCreateName().contains("Condition") || cf.getCreateName().contains("Renam")
-					|| cf.getCreateName().equals("ProductVariant")){
-				compartmentOtherEntry.addToolEntry(objectCreationToolEntry);
-			} else if (!cf.getCreateName().contentEquals("RefinementList")) {
-				compartmentStatementEntry.addToolEntry(objectCreationToolEntry);
-			}
-		}
-
-		// add all create-connection-features to the new stack-entry
-		ICreateConnectionFeature[] createConnectionFeatures = featureProvider.getCreateConnectionFeatures();
-		for (ICreateConnectionFeature cf : createConnectionFeatures) {
-			ConnectionCreationToolEntry connectionCreationToolEntry = new ConnectionCreationToolEntry(
-					cf.getCreateName(), cf.getCreateDescription(), cf.getCreateImageId(), cf.getCreateLargeImageId());
-			connectionCreationToolEntry.addCreateConnectionFeature(cf);
-			compartmentConnectionEntry.addToolEntry(connectionCreationToolEntry);
-		}
-
-		return ret.toArray(new IPaletteCompartmentEntry[ret.size()]);
-	}
-
-	@Override
-	public String getToolTip(GraphicsAlgorithm ga) {
-		PictogramElement pe = ga.getPictogramElement();
-		Object bo = getFeatureProvider().getBusinessObjectForPictogramElement(pe);
-		if (bo instanceof AbstractStatement) {
-			String comment = ((AbstractStatement) bo).getComment();
-			if (comment != null && !comment.isEmpty()) {
-				return comment;
-			}
-		} else if (bo instanceof CbCFormula) {
-			String comment = ((CbCFormula) bo).getComment();
-			CbCFormula domainObject = (CbCFormula) bo;
-<<<<<<< HEAD
-			if (domainObject.getMethodObj() != null && domainObject.getMethodObj().getParentClass().getInheritsFrom() != null) {
-=======
-			if (domainObject.getMethodObj() != null && domainObject.getMethodObj().getParentClass() != null && domainObject.getMethodObj().getParentClass().getInheritsFrom() != null) {
->>>>>>> master
-				for (Method m : domainObject.getMethodObj().getParentClass().getInheritsFrom().getMethods()) {
-					if (m.getCbcStartTriple().getName().equals(domainObject.getName())) {
-						comment = "This method has a super implementation. See properties view for more information." + (comment == null ? "" : (" // " + comment));
-					}
-				}
-			}
-			if (comment != null && !comment.isEmpty()) {
-				return comment;
-			}
-		}
-		return (String) super.getToolTip(ga);
-	}
-}
\ No newline at end of file
diff --git a/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/CompositionPattern.java.orig b/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/CompositionPattern.java.orig
deleted file mode 100644
index fdb86dbc5..000000000
--- a/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/CompositionPattern.java.orig
+++ /dev/null
@@ -1,637 +0,0 @@
-package de.tu_bs.cs.isf.cbc.tool.patterns;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.graphiti.features.IReason;
-import org.eclipse.graphiti.features.context.IAddContext;
-import org.eclipse.graphiti.features.context.ICreateContext;
-import org.eclipse.graphiti.features.impl.Reason;
-import org.eclipse.graphiti.mm.algorithms.GraphicsAlgorithm;
-import org.eclipse.graphiti.mm.algorithms.Image;
-import org.eclipse.graphiti.mm.algorithms.MultiText;
-import org.eclipse.graphiti.mm.algorithms.Polyline;
-import org.eclipse.graphiti.mm.algorithms.RoundedRectangle;
-import org.eclipse.graphiti.mm.algorithms.Text;
-import org.eclipse.graphiti.mm.algorithms.styles.Font;
-import org.eclipse.graphiti.mm.algorithms.styles.Orientation;
-import org.eclipse.graphiti.mm.algorithms.styles.Point;
-import org.eclipse.graphiti.mm.pictograms.ContainerShape;
-import org.eclipse.graphiti.mm.pictograms.Diagram;
-import org.eclipse.graphiti.mm.pictograms.PictogramElement;
-import org.eclipse.graphiti.mm.pictograms.Shape;
-import org.eclipse.graphiti.pattern.IPattern;
-import org.eclipse.graphiti.pattern.id.IdLayoutContext;
-import org.eclipse.graphiti.pattern.id.IdPattern;
-import org.eclipse.graphiti.pattern.id.IdUpdateContext;
-import org.eclipse.graphiti.services.Graphiti;
-import org.eclipse.graphiti.services.IGaService;
-import org.eclipse.graphiti.services.IPeCreateService;
-import org.eclipse.graphiti.services.IPeService;
-import org.eclipse.graphiti.util.IColorConstant;
-import org.eclipse.graphiti.util.PredefinedColoredAreas;
-
-import de.tu_bs.cs.isf.cbc.cbcmodel.AbstractStatement;
-import de.tu_bs.cs.isf.cbc.cbcmodel.CbcmodelFactory;
-import de.tu_bs.cs.isf.cbc.cbcmodel.CompositionStatement;
-import de.tu_bs.cs.isf.cbc.cbcmodel.Condition;
-import de.tu_bs.cs.isf.cbc.tool.diagram.CbCImageProvider;
-
-/**
- * Class that creates the graphical representation of Conditions
- * @author Tobias
- *
- */
-public class CompositionPattern extends IdPattern implements IPattern {
-
-	private static final String ID_ST1_TEXT = "statement1NameText";
-	private static final String ID_CONDITION_TEXT = "conditionText";
-<<<<<<< HEAD
-=======
-	private static final String ID_CONDITION_MOD = "otherConditionModifiables";
->>>>>>> master
-	private static final String ID_ST2_TEXT = "statement2NameText";
-	private static final String ID_MAIN_RECTANGLE = "mainRectangle";
-	private static final String ID_NAME_TEXT = "nameText";
-	private static final String ID_PRE1_TEXT = "pre1NameText";
-<<<<<<< HEAD
-	private static final String ID_POST2_TEXT = "post2NameText";
-=======
-	private static final String ID_PRE1_MOD = "preConditionModifiables";
-	private static final String ID_POST2_TEXT = "post2NameText";
-	private static final String ID_POST2_MOD = "postConditionModifiables";
->>>>>>> master
-	private static final String ID_IMAGE_PROVEN = "imageproven";
-	//Header:
-	private static final String ID_PRE_HEADER = "preHeader";
-	private static final String ID_POST_HEADER = "postHeader";
-	private static final String ID_ST1_HEADER = "statement1Header";
-	private static final String ID_ST2_HEADER = "statement2Header";
-	private static final String ID_IMC_HEADER = "intermediateCondHeader";
-	//lines:
-	private static final String ID_HOR1_LINE = "hor1Line";
-	private static final String ID_HOR2_LINE = "hor2Line";
-	private static final String ID_HOR3_LINE = "hor3Line";
-	private static final String ID_HOR4_LINE = "hor4Line";
-<<<<<<< HEAD
-=======
-	private static final String ID_HOR5_LINE = "hor5Line";
-	private static final String ID_HOR6_LINE = "hor6Line";
-	private static final String ID_HOR7_LINE = "hor7Line";
->>>>>>> master
-	private static final String ID_VER1_LINE = "ver1Line";
-	private static final String ID_VER2_LINE = "ver2Line";
-	private static final String ID_VER3_LINE = "ver3Line";
-
-
-	/**
-	 * Constructor of the class
-	 */
-	public CompositionPattern() {
-		super();
-	}
-	
-	@Override
-	public String getCreateName() {
-		return "CompositionStatement";
-	}
-	
-	@Override
-	public String getCreateDescription() {
-		return "Create a CompositionStatement.";
-	}
-
-	@Override
-	public boolean isMainBusinessObjectApplicable(Object mainBusinessObject) {
-		return mainBusinessObject instanceof CompositionStatement;
-	}
-
-	@Override
-	public boolean canCreate(ICreateContext context) {
-		return context.getTargetContainer() instanceof Diagram;
-	}
-	
-	@Override
-	public Object[] create(ICreateContext context) {
-		CompositionStatement compoStatement = CbcmodelFactory.eINSTANCE.createCompositionStatement();
-		compoStatement.setName("compositionStatement");
-		AbstractStatement statement1 = CbcmodelFactory.eINSTANCE.createAbstractStatement();
-		statement1.setName("statement1");
-		compoStatement.setFirstStatement(statement1);
-		Condition pre1 = CbcmodelFactory.eINSTANCE.createCondition();
-		pre1.setName("");
-		statement1.setPreCondition(pre1);
-		Condition post1 = CbcmodelFactory.eINSTANCE.createCondition();
-		post1.setName("");
-		statement1.setPostCondition(post1);
-		
-		Condition condition = CbcmodelFactory.eINSTANCE.createCondition();
-		condition.setName("intermediateCond");
-		compoStatement.setIntermediateCondition(condition);
-		AbstractStatement statement2 = CbcmodelFactory.eINSTANCE.createAbstractStatement();
-		statement2.setName("statement2");
-		compoStatement.setSecondStatement(statement2);
-		Condition pre2 = CbcmodelFactory.eINSTANCE.createCondition();
-		pre2.setName("");
-		statement2.setPreCondition(pre2);
-		Condition post2 = CbcmodelFactory.eINSTANCE.createCondition();
-		post2.setName("");
-		statement2.setPostCondition(post2);
-		
-		addGraphicalRepresentation(context, compoStatement);
-		return new Object[] { compoStatement };
-	}
-
-	@Override
-	public boolean canAdd(IAddContext context) {
-		return super.canAdd(context) && context.getTargetContainer() instanceof Diagram;
-	}
-
-	@Override
-	public PictogramElement doAdd(IAddContext context) {
-		manageColor(IColorConstant.DARK_GREEN);
-<<<<<<< HEAD
-=======
-		manageColor(IColorConstant.LIGHT_ORANGE);
->>>>>>> master
-		Diagram targetDiagram = (Diagram) context.getTargetContainer();
-		CompositionStatement addedStatement = (CompositionStatement) context.getNewObject();
-		IPeCreateService peCreateService = Graphiti.getPeCreateService();
-		IGaService gaService = Graphiti.getGaService();
-		int width = context.getWidth() <= 0 ? 500 : context.getWidth();
-<<<<<<< HEAD
-        int height = context.getHeight() <= 0 ? 300 : context.getHeight();
-=======
-        int height = context.getHeight() <= 0 ? 350 : context.getHeight();
->>>>>>> master
-        //font:
-        Font headerFont = gaService.manageFont(getDiagram(), "Arial", 9, false, true);
-        
-		// Main contents area
-		ContainerShape outerContainerShape = peCreateService.createContainerShape(targetDiagram, true);
-		RoundedRectangle mainRectangle = gaService.createRoundedRectangle(outerContainerShape, 20, 20);
-		mainRectangle.setFilled(true);
-		gaService.setRenderingStyle(mainRectangle, PredefinedColoredAreas.getBlueWhiteAdaptions());
-		mainRectangle.setForeground(manageColor(IColorConstant.RED));
-		mainRectangle.setLineWidth(2);
-		setId(mainRectangle, ID_MAIN_RECTANGLE);
-		gaService.setLocationAndSize(mainRectangle,
-	            context.getX(), context.getY(), width, height);
-
-        // create link and wire it
-        link(outerContainerShape, addedStatement);
-
-		// Statement name
-        Shape textShapeStatement1 = peCreateService.createShape(outerContainerShape, true);
-		MultiText statement1Text = gaService.createMultiText(textShapeStatement1, "");
-		setId(statement1Text, ID_ST1_TEXT);
-		statement1Text.setValue(addedStatement.getFirstStatement().getName());
-		statement1Text.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		statement1Text.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		
-		Shape textShapeCondition = peCreateService.createShape(outerContainerShape, true);
-		MultiText conditionText = gaService.createMultiText(textShapeCondition, "{" + addedStatement.getIntermediateCondition().getName() + "}");
-		setId(conditionText, ID_CONDITION_TEXT);
-		conditionText.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		conditionText.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		
-<<<<<<< HEAD
-=======
-		Shape textShapeIntmConditionMod = peCreateService.createShape(outerContainerShape, true);
-		MultiText intmConditionTextMod = gaService.createMultiText(textShapeIntmConditionMod, "");
-		setId(intmConditionTextMod, ID_CONDITION_MOD);
-		String modString = "";
-		for (String s : addedStatement.getIntermediateCondition().getModifiables()) {
-			modString += s + ", ";
-		}
-		intmConditionTextMod.setValue("modifiable(" + (modString.equals("") ? "" : modString.substring(0, modString.length() - 2)) + ");");
-		intmConditionTextMod.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		intmConditionTextMod.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		
->>>>>>> master
-		Shape textShapeStatement2 = peCreateService.createShape(outerContainerShape, true);
-		MultiText statement2Text = gaService.createMultiText(textShapeStatement2, "");
-		setId(statement2Text, ID_ST2_TEXT);
-		statement2Text.setValue(addedStatement.getSecondStatement().getName());
-		statement2Text.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		statement2Text.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		
-		Shape textShapeName = peCreateService.createShape(outerContainerShape, false);
-		MultiText nameText = gaService.createMultiText(textShapeName, "Composition");
-		setId(nameText, ID_NAME_TEXT);
-		nameText.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		nameText.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		nameText.setFont(headerFont);
-		
-		Shape pre1Shape = peCreateService.createShape(outerContainerShape, false);
-		MultiText pre1NameText = gaService.createMultiText(pre1Shape, "{" + addedStatement.getFirstStatement().getPreCondition().getName()+ "}");
-		setId(pre1NameText, ID_PRE1_TEXT);
-		pre1NameText.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		pre1NameText.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		
-<<<<<<< HEAD
-=======
-		Shape textShapePreConditionMod = peCreateService.createShape(outerContainerShape, true);
-		MultiText preConditionTextMod = gaService.createMultiText(textShapePreConditionMod, "");
-		setId(preConditionTextMod, ID_PRE1_MOD);
-		modString = "";
-		for (String s : addedStatement.getIntermediateCondition().getModifiables()) {
-			modString += s + ", ";
-		}
-		preConditionTextMod.setValue("modifiable(" + (modString.equals("") ? "" : modString.substring(0, modString.length() - 2)) + ");");
-		preConditionTextMod.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		preConditionTextMod.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		
->>>>>>> master
-		Shape post2Shape = peCreateService.createShape(outerContainerShape, false);
-		MultiText post2NameText = gaService.createMultiText(post2Shape, "{" + addedStatement.getSecondStatement().getPostCondition().getName()+ "}");
-		setId(post2NameText, ID_POST2_TEXT);
-		post2NameText.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		post2NameText.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		
-<<<<<<< HEAD
-=======
-		Shape textShapePostConditionMod = peCreateService.createShape(outerContainerShape, true);
-		MultiText postConditionTextMod = gaService.createMultiText(textShapePostConditionMod, "");
-		setId(postConditionTextMod, ID_POST2_MOD);
-		modString = "";
-		for (String s : addedStatement.getIntermediateCondition().getModifiables()) {
-			modString += s + ", ";
-		}
-		postConditionTextMod.setValue("modifiable(" + (modString.equals("") ? "" : modString.substring(0, modString.length() - 2)) + ");");
-		postConditionTextMod.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		postConditionTextMod.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		
->>>>>>> master
-		Shape proveShape = peCreateService.createShape(outerContainerShape, false);
-		Image image = gaService.createImage(proveShape, CbCImageProvider.IMG_UNPROVEN);
-		setId(image, ID_IMAGE_PROVEN);
-
-		//Header:
-		Shape preHeaderShape = peCreateService.createShape(outerContainerShape, false);
-		Text preHeader = gaService.createText(preHeaderShape, "precondition");
-		setId(preHeader, ID_PRE_HEADER);
-		preHeader.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		preHeader.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		preHeader.setFont(headerFont);
-		
-		Shape postHeaderShape = peCreateService.createShape(outerContainerShape, false);
-		Text postHeader = gaService.createText(postHeaderShape, "postcondition");
-		setId(postHeader, ID_POST_HEADER);
-		postHeader.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		postHeader.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		postHeader.setFont(headerFont);
-		
-		Shape st1HeaderShape = peCreateService.createShape(outerContainerShape, false);
-		Text st1Header = gaService.createText(st1HeaderShape, "statement 1");
-		setId(st1Header, ID_ST1_HEADER);
-		st1Header.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		st1Header.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		st1Header.setFont(headerFont);
-		
-		Shape st2HeaderShape = peCreateService.createShape(outerContainerShape, false);
-		Text st2Header = gaService.createText(st2HeaderShape, "statement 2");
-		setId(st2Header, ID_ST2_HEADER);
-		st2Header.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		st2Header.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		st2Header.setFont(headerFont);
-		
-		Shape imcHeaderShape = peCreateService.createShape(outerContainerShape, false);
-		Text imcHeader = gaService.createText(imcHeaderShape, "intermediate condition");
-		setId(imcHeader, ID_IMC_HEADER);
-		imcHeader.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		imcHeader.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		imcHeader.setFont(headerFont);
-		//lines:
-		Shape hor1LineShape = peCreateService.createShape(outerContainerShape, false);
-		Polyline hor1Line = gaService.createPolyline(hor1LineShape);
-		setId(hor1Line, ID_HOR1_LINE);
-		
-		Shape hor2LineShape = peCreateService.createShape(outerContainerShape, false);
-		Polyline hor2Line = gaService.createPolyline(hor2LineShape);
-		setId(hor2Line, ID_HOR2_LINE);
-		
-		Shape hor3LineShape = peCreateService.createShape(outerContainerShape, false);
-		Polyline hor3Line = gaService.createPolyline(hor3LineShape);
-		setId(hor3Line, ID_HOR3_LINE);
-		
-		Shape hor4LineShape = peCreateService.createShape(outerContainerShape, false);
-		Polyline hor4Line = gaService.createPolyline(hor4LineShape);
-		setId(hor4Line, ID_HOR4_LINE);
-		
-<<<<<<< HEAD
-=======
-		Shape hor5LineShape = peCreateService.createShape(outerContainerShape, false);
-		Polyline hor5Line = gaService.createPolyline(hor5LineShape);
-		setId(hor5Line, ID_HOR5_LINE);
-		
-		Shape hor6LineShape = peCreateService.createShape(outerContainerShape, false);
-		Polyline hor6Line = gaService.createPolyline(hor6LineShape);
-		setId(hor6Line, ID_HOR6_LINE);
-		
-		Shape hor7LineShape = peCreateService.createShape(outerContainerShape, false);
-		Polyline hor7Line = gaService.createPolyline(hor7LineShape);
-		setId(hor7Line, ID_HOR7_LINE);
-		
->>>>>>> master
-		Shape ver1LineShape = peCreateService.createShape(outerContainerShape, false);
-		Polyline ver1Line = gaService.createPolyline(ver1LineShape);
-		setId(ver1Line, ID_VER1_LINE);
-		
-		Shape ver2LineShape = peCreateService.createShape(outerContainerShape, false);
-		Polyline ver2Line = gaService.createPolyline(ver2LineShape);
-		setId(ver2Line, ID_VER2_LINE);
-		
-		Shape ver3LineShape = peCreateService.createShape(outerContainerShape, false);
-		Polyline ver3Line = gaService.createPolyline(ver3LineShape);
-		setId(ver3Line, ID_VER3_LINE);
-				
-		peCreateService.createChopboxAnchor(textShapeStatement1);
-		peCreateService.createChopboxAnchor(textShapeStatement2);
-		peCreateService.createChopboxAnchor(outerContainerShape);
-
-		link(outerContainerShape, addedStatement);
-		link(textShapeCondition, addedStatement.getIntermediateCondition());
-<<<<<<< HEAD
-		link(textShapeStatement1, addedStatement.getFirstStatement());
-		link(textShapeStatement2, addedStatement.getSecondStatement());
-		link(pre1Shape, addedStatement.getFirstStatement().getPreCondition());
-		link(post2Shape, addedStatement.getSecondStatement().getPostCondition());
-=======
-		link(textShapeIntmConditionMod, addedStatement.getIntermediateCondition());
-		link(textShapeStatement1, addedStatement.getFirstStatement());
-		link(textShapeStatement2, addedStatement.getSecondStatement());
-		link(pre1Shape, addedStatement.getFirstStatement().getPreCondition());
-		link(textShapePreConditionMod, addedStatement.getFirstStatement().getPreCondition());
-		link(post2Shape, addedStatement.getSecondStatement().getPostCondition());
-		link(textShapePostConditionMod, addedStatement.getSecondStatement().getPostCondition());
->>>>>>> master
-		link(proveShape, addedStatement);
-		
-		return outerContainerShape;
-	}
-
-	@Override
-	protected boolean layout(IdLayoutContext context, String id) {
-		boolean changesDone = false;
-		
-		GraphicsAlgorithm mainRectangle = context.getRootPictogramElement().getGraphicsAlgorithm();
-		GraphicsAlgorithm ga = context.getGraphicsAlgorithm();
-		int thirdWidth = mainRectangle.getWidth() / 3;
-		int halfWidth = mainRectangle.getWidth() / 2;
-<<<<<<< HEAD
-		int sizeName = 60; //size of the name from the Statement (Composition)
-=======
-		int sizeName = 40; //size of the name from the Statement (Composition)
->>>>>>> master
-		int HeightWithoutName = mainRectangle.getHeight() - sizeName; //size from the statement without the Name block, -20 for some space
-		int sizeHeader = 20;
-		int blockSize = HeightWithoutName / 2 - sizeHeader; //size from one block (statement, pre, ..)
-		int positionLine1 = mainRectangle.getHeight() - HeightWithoutName;
-		int positionLine2 = mainRectangle.getHeight() - HeightWithoutName / 2;
-		
-		if (id.equals(ID_NAME_TEXT)) {
-			Graphiti.getGaService().setLocationAndSize(ga, 0, 0, mainRectangle.getWidth(), sizeName);
-			changesDone = true;
-		} else if (id.equals(ID_ST1_TEXT)) {
-			Graphiti.getGaService().setLocationAndSize(ga, 0, positionLine2 + sizeHeader, thirdWidth, blockSize);
-			changesDone = true;
-		} else if (id.equals(ID_CONDITION_TEXT)) {
-<<<<<<< HEAD
-			Graphiti.getGaService().setLocationAndSize(ga, thirdWidth, positionLine2 + sizeHeader, thirdWidth, blockSize);
-=======
-			Graphiti.getGaService().setLocationAndSize(ga, thirdWidth, positionLine2 + sizeHeader + blockSize/3, thirdWidth, 2 * blockSize/3);
-			changesDone = true;
-		} else if (id.equals(ID_CONDITION_MOD)) {
-			Graphiti.getGaService().setLocationAndSize(ga, thirdWidth, positionLine2 + sizeHeader, thirdWidth, blockSize/3);
->>>>>>> master
-			changesDone = true;
-		} else if (id.equals(ID_ST2_TEXT)) {
-			Graphiti.getGaService().setLocationAndSize(ga, thirdWidth * 2, positionLine2 + sizeHeader, thirdWidth, blockSize);
-			changesDone = true;
-		} else if (id.equals(ID_PRE1_TEXT)) {
-<<<<<<< HEAD
-			Graphiti.getGaService().setLocationAndSize(ga, 0, positionLine1 + sizeHeader, halfWidth, blockSize);
-			changesDone = true;
-		}  else if (id.equals(ID_POST2_TEXT)) {
-			Graphiti.getGaService().setLocationAndSize(ga, halfWidth, positionLine1 + sizeHeader, halfWidth, blockSize);
-=======
-			Graphiti.getGaService().setLocationAndSize(ga, 0, positionLine1 + sizeHeader + blockSize/3, halfWidth, 2 * blockSize/3);
-			changesDone = true;
-		} else if (id.equals(ID_PRE1_MOD)) {
-			Graphiti.getGaService().setLocationAndSize(ga, 0, positionLine1 + sizeHeader, halfWidth, blockSize/3);
-			changesDone = true;
-		} else if (id.equals(ID_POST2_TEXT)) {
-			Graphiti.getGaService().setLocationAndSize(ga, halfWidth, positionLine1 + sizeHeader + blockSize/3, halfWidth, 2 * blockSize/3);
-			changesDone = true;
-		} else if (id.equals(ID_POST2_MOD)) {
-			Graphiti.getGaService().setLocationAndSize(ga, halfWidth, positionLine1 + sizeHeader, halfWidth, blockSize/3);
->>>>>>> master
-			changesDone = true;
-		} else if (id.equals(ID_IMAGE_PROVEN)) {
-			Graphiti.getGaService().setLocationAndSize(ga, mainRectangle.getWidth() - 20, 10, 10, 10);
-			changesDone = true;
-			
-		//HEADER:
-		} else if (id.equals(ID_PRE_HEADER)) {
-			Graphiti.getGaService().setLocationAndSize(ga, 0, positionLine1, halfWidth, sizeHeader);
-			changesDone = true;
-		} else if (id.equals(ID_POST_HEADER)) {
-			Graphiti.getGaService().setLocationAndSize(ga,  halfWidth, positionLine1, halfWidth, sizeHeader);
-			changesDone = true;
-		} else if (id.equals(ID_ST1_HEADER)) {
-			Graphiti.getGaService().setLocationAndSize(ga, 0, positionLine2, thirdWidth, sizeHeader);
-			changesDone = true;
-		} else if (id.equals(ID_ST2_HEADER)) {
-			Graphiti.getGaService().setLocationAndSize(ga, thirdWidth * 2, positionLine2, thirdWidth, sizeHeader);
-			changesDone = true;
-		} else if (id.equals(ID_IMC_HEADER)) {
-			Graphiti.getGaService().setLocationAndSize(ga, thirdWidth, positionLine2, thirdWidth, sizeHeader);
-			changesDone = true;
-		//lines:	
-		} else if (id.equals(ID_HOR1_LINE)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService().createPointList(
-					new int[] { 0, positionLine1, mainRectangle.getWidth(), positionLine1});
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		} else if (id.equals(ID_HOR2_LINE)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService().createPointList(
-					new int[] { 0, positionLine1 + sizeHeader, mainRectangle.getWidth(), positionLine1 + sizeHeader});
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		} else if (id.equals(ID_HOR3_LINE)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService().createPointList(
-					new int[] { 0, positionLine2 , mainRectangle.getWidth(), positionLine2});
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		} else if (id.equals(ID_HOR4_LINE)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService().createPointList(
-					new int[] { 0, positionLine2 + sizeHeader, mainRectangle.getWidth(), positionLine2 + sizeHeader});
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-<<<<<<< HEAD
-=======
-		} else if (id.equals(ID_HOR5_LINE)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService().createPointList(
-					new int[] { thirdWidth, positionLine2 + sizeHeader + blockSize/3, thirdWidth*2, positionLine2 + sizeHeader + blockSize/3});
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		} else if (id.equals(ID_HOR6_LINE)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService().createPointList(
-					new int[] { 0, positionLine1 + sizeHeader + blockSize/3, halfWidth, positionLine1 + sizeHeader + blockSize/3});
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		} else if (id.equals(ID_HOR7_LINE)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService().createPointList(
-					new int[] { halfWidth, positionLine1 + sizeHeader + blockSize/3, mainRectangle.getWidth(), positionLine1 + sizeHeader + blockSize/3});
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
->>>>>>> master
-		} else if (id.equals(ID_VER1_LINE)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService().createPointList(
-					new int[] { halfWidth, positionLine1, halfWidth, positionLine2 });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		} else if (id.equals(ID_VER2_LINE)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService().createPointList(
-					new int[] { thirdWidth, positionLine2, thirdWidth, mainRectangle.getHeight() });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		} else if (id.equals(ID_VER3_LINE)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService().createPointList(
-					new int[] { thirdWidth * 2, positionLine2, thirdWidth * 2, mainRectangle.getHeight() });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		}
-
-		return changesDone;
-	}
-	
-	@Override
-	protected IReason updateNeeded(IdUpdateContext context, String id) {
-		if (id.equals(ID_MAIN_RECTANGLE)) {
-			RoundedRectangle rectangle = (RoundedRectangle) context.getGraphicsAlgorithm();
-			CompositionStatement domainObject = (CompositionStatement) context.getDomainObject();
-			if (checkIsProven(domainObject) &&
-					((rectangle.getForeground() != null && !rectangle.getForeground().equals(manageColor(IColorConstant.DARK_GREEN))) 
-							|| rectangle.getForeground() == null)) {
-				return Reason.createTrueReason("Statement is proven. Expected green color.");
-<<<<<<< HEAD
-			} else if (!checkIsProven(domainObject) && 
-					((rectangle.getForeground() != null && rectangle.getForeground().equals(manageColor(IColorConstant.DARK_GREEN))) 
-=======
-			} else if (!checkIsProven(domainObject) && domainObject.isTested() &&
-					((rectangle.getForeground() != null && !rectangle.getForeground().equals(manageColor(IColorConstant.LIGHT_ORANGE))) 
-							|| rectangle.getForeground() == null)) {
-				return Reason.createTrueReason("Statement is tested. Expected orange color.");
-			} else if (!checkIsProven(domainObject) && !domainObject.isTested() && 
-					((rectangle.getForeground() != null && (rectangle.getForeground().equals(manageColor(IColorConstant.DARK_GREEN)) || rectangle.getForeground().equals(manageColor(IColorConstant.LIGHT_ORANGE)))) 
->>>>>>> master
-							|| rectangle.getForeground() == null)) {
-				return Reason.createTrueReason("Statement is not proven. Expected red color.");
-			}  
-		} 
-		else if (id.equals(ID_IMAGE_PROVEN)) {
-			CompositionStatement domainObject = (CompositionStatement) context.getDomainObject();
-			 Image image = (Image) context.getGraphicsAlgorithm();
-			if (checkIsProven(domainObject) && image.getId().equals(CbCImageProvider.IMG_UNPROVEN)) {
-				return Reason.createTrueReason("Statement is proven. Expected green color.");
-			} else if (!checkIsProven(domainObject) && image.getId().equals(CbCImageProvider.IMG_PROVEN)) {
-				return Reason.createTrueReason("Statement is not proven. Expected red color.");
-			} 
-		}
-		return Reason.createFalseReason();
-	}
-
-	@Override
-	protected boolean update(IdUpdateContext context, String id) {
-		if (id.equals(ID_MAIN_RECTANGLE)) {
-			RoundedRectangle rectangle = (RoundedRectangle) context.getGraphicsAlgorithm();
-			CompositionStatement domainObject = (CompositionStatement) context.getDomainObject();
-			if (checkIsProven(domainObject)) {
-				domainObject.setProven(true);
-				rectangle.setForeground(manageColor(IColorConstant.DARK_GREEN));
-				updateParent(domainObject);
-<<<<<<< HEAD
-			} else {
-				domainObject.setProven(false);
-=======
-			} else if (domainObject.isTested()) {
-				domainObject.setTested(true);
-				rectangle.setForeground(manageColor(IColorConstant.LIGHT_ORANGE));
-				updateParent(domainObject);
-			} else {
-				domainObject.setProven(false);
-				domainObject.setTested(false);
->>>>>>> master
-				rectangle.setForeground(manageColor(IColorConstant.RED));
-				updateParent(domainObject);
-			}
-			return true;
-		} 
-		else if (id.equals(ID_IMAGE_PROVEN)) {
-			CompositionStatement domainObject = (CompositionStatement) context.getDomainObject();
-			 Image image = (Image) context.getGraphicsAlgorithm();
-			if (checkIsProven(domainObject)) {
-				image.setId(CbCImageProvider.IMG_PROVEN);
-			} else {
-				image.setId(CbCImageProvider.IMG_UNPROVEN);
-			} 
-		}
-		return false;
-	}
-	
-	private boolean checkIsProven(CompositionStatement statement) {
-		AbstractStatement firstStatement = statement.getFirstStatement();
-		AbstractStatement secondStatement = statement.getSecondStatement();
-		AbstractStatement firstStatementToCheck = null;
-		AbstractStatement secondStatementToCheck = null;
-		if (firstStatement.getRefinement() != null) {
-			firstStatementToCheck = firstStatement.getRefinement();
-		} else {
-			firstStatementToCheck = firstStatement;
-		}
-		if (secondStatement.getRefinement() != null) {
-			secondStatementToCheck = secondStatement.getRefinement();
-		} else {
-			secondStatementToCheck = secondStatement;
-		}
-		if (firstStatementToCheck.isProven() && secondStatementToCheck.isProven()) {
-			return true;
-		} else {
-			return false;
-		}
-	}
-	
-	private void updateParent(AbstractStatement statement) {
-		if(statement.getParent()!= null) {
-			IPeService pe = Graphiti.getPeService();
-			EObject[] objArray = {statement.getParent()};
-			Object[] obj =  pe.getLinkedPictogramElements(objArray, getDiagram());
-			if (obj.length > 0) {
-				Shape pElement = (Shape) obj[0];
-				if (pElement.getContainer() != null) updatePictogramElement(pElement.getContainer());
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/ConditionPattern.java.orig b/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/ConditionPattern.java.orig
deleted file mode 100644
index 54cb08cd0..000000000
--- a/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/ConditionPattern.java.orig
+++ /dev/null
@@ -1,536 +0,0 @@
-package de.tu_bs.cs.isf.cbc.tool.patterns;
-
-<<<<<<< HEAD
-=======
-import java.io.IOException;
-import java.util.Collections;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
->>>>>>> master
-import org.eclipse.graphiti.features.IReason;
-import org.eclipse.graphiti.features.context.IAddContext;
-import org.eclipse.graphiti.features.context.ICreateContext;
-import org.eclipse.graphiti.features.context.IDeleteContext;
-import org.eclipse.graphiti.features.context.IDirectEditingContext;
-import org.eclipse.graphiti.features.context.IRemoveContext;
-import org.eclipse.graphiti.features.impl.Reason;
-import org.eclipse.graphiti.mm.algorithms.GraphicsAlgorithm;
-import org.eclipse.graphiti.mm.algorithms.MultiText;
-import org.eclipse.graphiti.mm.algorithms.Text;
-import org.eclipse.graphiti.mm.algorithms.impl.TextImpl;
-import org.eclipse.graphiti.mm.pictograms.ContainerShape;
-import org.eclipse.graphiti.mm.pictograms.PictogramElement;
-import org.eclipse.graphiti.mm.pictograms.Shape;
-import org.eclipse.graphiti.mm.pictograms.impl.ShapeImpl;
-import org.eclipse.graphiti.pattern.IPattern;
-import org.eclipse.graphiti.pattern.id.IdLayoutContext;
-import org.eclipse.graphiti.pattern.id.IdPattern;
-import org.eclipse.graphiti.pattern.id.IdUpdateContext;
-<<<<<<< HEAD
-
-import de.tu_bs.cs.isf.cbc.cbcclass.model.cbcclass.ModelClass;
-import de.tu_bs.cs.isf.cbc.cbcmodel.AbstractStatement;
-import de.tu_bs.cs.isf.cbc.cbcmodel.CbCFormula;
-import de.tu_bs.cs.isf.cbc.cbcmodel.CbcmodelFactory;
-import de.tu_bs.cs.isf.cbc.cbcmodel.Condition;
-import de.tu_bs.cs.isf.cbc.cbcmodel.GlobalConditions;
-=======
-import org.eclipse.graphiti.services.Graphiti;
-import org.eclipse.graphiti.services.IPeService;
-import org.eclipse.xtext.resource.SaveOptions;
-
-import de.tu_bs.cs.isf.cbc.cbcclass.ModelClass;
-import de.tu_bs.cs.isf.cbc.cbcmodel.AbstractStatement;
-import de.tu_bs.cs.isf.cbc.cbcmodel.CbCFormula;
-import de.tu_bs.cs.isf.cbc.cbcmodel.CbcmodelFactory;
-import de.tu_bs.cs.isf.cbc.cbcmodel.CompositionStatement;
-import de.tu_bs.cs.isf.cbc.cbcmodel.Condition;
-import de.tu_bs.cs.isf.cbc.cbcmodel.GlobalConditions;
-import de.tu_bs.cs.isf.cbc.cbcmodel.SelectionStatement;
-import de.tu_bs.cs.isf.cbc.cbcmodel.SmallRepetitionStatement;
->>>>>>> master
-import de.tu_bs.cs.isf.cbc.cbcmodel.StrengthWeakStatement;
-import de.tu_bs.cs.isf.cbc.cbcmodel.impl.AbstractStatementImpl;
-import de.tu_bs.cs.isf.cbc.cbcmodel.impl.CompositionStatementImpl;
-import de.tu_bs.cs.isf.cbc.cbcmodel.impl.ReturnStatementImpl;
-import de.tu_bs.cs.isf.cbc.cbcmodel.impl.SkipStatementImpl;
-import de.tu_bs.cs.isf.cbc.cbcmodel.impl.StrengthWeakStatementImpl;
-<<<<<<< HEAD
-import de.tu_bs.cs.isf.cbc.tool.helper.UpdateConditionsOfChildren;
-=======
-import de.tu_bs.cs.isf.cbc.parser.exceptions.IFbCException;
-import de.tu_bs.cs.isf.cbc.tool.features.TestStatement;
-import de.tu_bs.cs.isf.cbc.tool.helper.GetProjectUtil;
-import de.tu_bs.cs.isf.cbc.tool.helper.UpdateContractsToProve;
-import de.tu_bs.cs.isf.cbc.tool.helper.UpdateInformationFlow;
-import de.tu_bs.cs.isf.cbc.tool.helper.UpdateMethodCallsToProve;
-import de.tu_bs.cs.isf.cbc.tool.helper.UpdateOriginalCallsToProve;
-import de.tu_bs.cs.isf.cbc.util.FeatureUtil;
-import de.tu_bs.cs.isf.cbc.util.UpdateConditionsOfChildren;
-import de.tu_bs.cs.isf.lattice.Lattice;
-import de.tu_bs.cs.isf.lattice.Lattices;
->>>>>>> master
-
-/**
- * Class that creates the graphical representation of Conditions
- * 
- * @author Tobias
- *
- */
-public class ConditionPattern extends IdPattern implements IPattern {
-
-<<<<<<< HEAD
-	// private static final String ID_NAME_TEXT = "conditionNameText";
-	// private static final String ID_MAIN_RECTANGLE = "mainRectangle";
-=======
-	private static final String ID_PRE_MOD = "preConditionModifiables";
-	private static final String ID_POST_MOD = "postConditionModifiables";
-	private static final String ID_OTHER_MOD = "otherConditionModifiables";
->>>>>>> master
-
-	/**
-	 * Constructor of the class
-	 */
-	public ConditionPattern() {
-		super();
-	}
-
-	@Override
-	public String getCreateName() {
-		return "Condition";
-	}
-
-	@Override
-	public String getCreateDescription() {
-		return "Create a Condition.";
-	}
-
-	@Override
-	public boolean isMainBusinessObjectApplicable(Object mainBusinessObject) {
-		return mainBusinessObject instanceof Condition;
-	}
-
-	@Override
-	public boolean canCreate(ICreateContext context) {
-		return getBusinessObjectForPictogramElement(context.getTargetContainer()) instanceof GlobalConditions;
-	}
-
-	@Override
-	public Object[] create(ICreateContext context) {
-		Condition condition = CbcmodelFactory.eINSTANCE.createCondition();
-		condition.setName("{}");
-<<<<<<< HEAD
-		GlobalConditions conditions = (GlobalConditions) getBusinessObjectForPictogramElement(
-				context.getTargetContainer());
-=======
-		GlobalConditions conditions = (GlobalConditions) getBusinessObjectForPictogramElement(context.getTargetContainer());
->>>>>>> master
-		conditions.getConditions().add(condition);
-		updatePictogramElement(context.getTargetContainer());
-		return new Object[] { condition };
-	}
-
-	@Override
-	public boolean canAdd(IAddContext context) {
-		return super.canAdd(context) && context.getTargetContainer() instanceof GlobalConditions;
-	}
-
-	@Override
-	public PictogramElement doAdd(IAddContext context) {
-		return null;
-	}
-
-	@Override
-	protected boolean layout(IdLayoutContext context, String id) {
-		return false;
-	}
-
-	@Override
-	protected IReason updateNeeded(IdUpdateContext context, String id) {
-		if (context.getGraphicsAlgorithm() instanceof MultiText) {
-			MultiText nameText = (MultiText) context.getGraphicsAlgorithm();
-			Condition domainObject = (Condition) context.getDomainObject();
-<<<<<<< HEAD
-=======
-			if (id.equals(ID_PRE_MOD) || id.equals(ID_POST_MOD) || id.equals(ID_OTHER_MOD)) {
-				String modString = "";
-				for (String s : domainObject.getModifiables()) {
-					modString += s + ", ";
-				}
-				modString = "modifiable(" + (modString.equals("") ? "" : modString.substring(0, modString.length() - 2)) + ");";
-				if (!(modString.equals(nameText.getValue()))) {
-					return Reason.createTrueReason("Name differs. Expected: '" + modString + "'");
-				} else {
-					return Reason.createFalseReason();
-				}
-			}
->>>>>>> master
-			if (domainObject.getName() == null || !(domainObject.getName().equals(nameText.getValue())
-					|| nameText.getValue().equals("{" + domainObject.getName() + "}"))) {
-				return Reason.createTrueReason("Name differs. Expected: '" + domainObject.getName() + "'");
-			}
-		}
-<<<<<<< HEAD
-
-=======
->>>>>>> master
-		return Reason.createFalseReason();
-	}
-
-	@Override
-	protected boolean update(IdUpdateContext context, String id) {
-		if (context.getGraphicsAlgorithm() instanceof MultiText) {
-			MultiText nameText = (MultiText) context.getGraphicsAlgorithm();
-			Condition domainObject = (Condition) context.getDomainObject();
-<<<<<<< HEAD
-=======
-			if (id.equals(ID_PRE_MOD) || id.equals(ID_POST_MOD) || id.equals(ID_OTHER_MOD)) {
-				if (!nameText.getValue().equals("")) {
-					String modString = "";
-					for (String s : domainObject.getModifiables()) {
-						modString += s + ", ";
-					}
-					nameText.setValue("modifiable(" + (modString.equals("") ? "" : modString.substring(0, modString.length() - 2)) + ");");
-				}
-				return true;
-			}
->>>>>>> master
-			if (domainObject.eContainer().getClass().equals(AbstractStatementImpl.class)
-					|| domainObject.eContainer().getClass().equals(SkipStatementImpl.class)
-					|| domainObject.eContainer().getClass().equals(ReturnStatementImpl.class)
-					|| domainObject.eContainer().getClass().equals(StrengthWeakStatementImpl.class)
-					|| domainObject.eContainer().getClass().equals(CompositionStatementImpl.class)) {
-				nameText.setValue("{" + domainObject.getName() + "}");
-			} else {
-				nameText.setValue(domainObject.getName());
-			}
-			return true;
-		}
-		return false;
-	}
-
-	@Override
-	public int getEditingType() {
-		return TYPE_MULTILINETEXT;
-	}
-
-	@Override
-	public boolean canDirectEdit(IDirectEditingContext context) {
-		Object domainObject = getBusinessObjectForPictogramElement(context.getPictogramElement());
-		GraphicsAlgorithm ga = context.getGraphicsAlgorithm();
-		if (domainObject instanceof Condition && ga instanceof MultiText) {
-			Condition condition = ((Condition) domainObject);
-			if (condition.eContainer() instanceof AbstractStatement) {
-				AbstractStatement statement = (AbstractStatement) condition.eContainer();
-				if (statement.eContainer() instanceof CbCFormula || statement instanceof StrengthWeakStatement) {
-					return true;
-				} else if (statement.getPreCondition() != null && statement.getPreCondition().equals(condition)) {
-					return false;
-				} else if (statement.getPostCondition() != null && statement.getPostCondition().equals(condition)) {
-					return false;
-				}
-				return true;
-			} else if (condition.eContainer() instanceof GlobalConditions) {
-				return true;
-			}
-		}
-		if (domainObject instanceof Condition && ga instanceof Text) {
-			Condition condition = ((Condition) domainObject);
-			if (condition.eContainer() instanceof ModelClass) {
-				ModelClass mc = (ModelClass) condition.eContainer();
-				if (mc.getName().equals(getDiagram().getName())) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	@Override
-<<<<<<< HEAD
-	public String getInitialValue(IDirectEditingContext context) {
-		Condition condition = (Condition) getBusinessObjectForPictogramElement(context.getPictogramElement());
-		return System.getProperty("line.separator") + condition.getName() + System.getProperty("line.separator");
-	}
-
-	@Override
-	public String checkValueValid(String value, IDirectEditingContext context) {
-		if (value == null) {
-			return "Condition must not be empty";
-		}
-		if (value.length() > 0) {
-			if (value.contains("modifiable(")) {
-				String[] valueSplitted = value.split(";");
-				if (valueSplitted.length > 1
-						&& !valueSplitted[0].trim().matches("modifiable\\(\\w+[\\[\\]\\*]*(,\\w+[\\[\\]\\*]*)*\\)")) {
-					return null;// "modifiable variables must be defined as: modifiable(x,y,z,...);";
-				} else if ((value.contains("forall") || value.contains("exists"))) {
-					return null;
-				}
-			}
-=======
-	public String getInitialValue(IDirectEditingContext context, String id) {
-		Condition condition = (Condition) getBusinessObjectForPictogramElement(context.getPictogramElement());
-		if (id.equals(ID_PRE_MOD) || id.equals(ID_POST_MOD) || id.equals(ID_OTHER_MOD)) {
-			String modString = "";
-			for (String s : condition.getModifiables()) {
-				modString += s + ", ";
-			}			
-			return System.getProperty("line.separator") + ("modifiable(" + (modString.equals("") ? "" : modString.substring(0, modString.length() - 2)) + ");") + System.getProperty("line.separator");
-		} else {
-			return System.getProperty("line.separator") + condition.getName() + System.getProperty("line.separator");
-		}
-	}
-
-	@Override
-	public String checkValueValid(String value, IDirectEditingContext context, String id) {
-		if (value == null) {
-			return "Must not be empty";
-		}
-		if (id.equals(ID_PRE_MOD) || id.equals(ID_POST_MOD) || id.equals(ID_OTHER_MOD)) {
-			if (value.length() > 0) {
-				if (!value.trim().startsWith("modifiable(") || !value.trim().endsWith(");")) {
-					return "Does not match modifiable string";
-				}
-			}
-		} else {
-			if (value.length() > 0) {
-				// valid string for condition or global condition
-			}
->>>>>>> master
-		}
-		return null;
-	}
-
-	@Override
-<<<<<<< HEAD
-	public void setValue(String value, IDirectEditingContext context) {
-		Condition condition = (Condition) getBusinessObjectForPictogramElement(context.getPictogramElement());
-		condition.setName(value.trim());
-		if (condition.eContainer() instanceof ModelClass) {
-			ShapeImpl shape = (ShapeImpl)context.getPictogramElement();
-			TextImpl text = (TextImpl)shape.getGraphicsAlgorithm();
-			text.setValue("{" + condition.getName() + "}");
-		} else if (!(condition.eContainer() instanceof GlobalConditions)) {
-			// TODO: updateOriginalCallsToProve, updateMethodCallsToProve and
-			// updateContractsToProve
-			// needs to be triggered, when the whole diagram is saved and not exiting
-			// code-edit mode
-			//UpdateOriginalCallsToProve.updateOriginalCallsToProve(condition); TODO von max auskommentiert aufgrund nullpointerexception bei änderung einer bedingung
-			//UpdateMethodCallsToProve.updateMethodCallsToProve(condition); TODO von max auskommentiert aufgrund nullpointerexception bei änderung einer bedingung
-			//UpdateContractsToProve.updateContractsToProve(condition); TODO von max auskommentiert aufgrund nullpointerexception bei änderung einer bedingung
-=======
-	public void setValue(String value, IDirectEditingContext context, String id) {
-		Condition condition = (Condition) getBusinessObjectForPictogramElement(context.getPictogramElement());
-		var container = condition.eContainer().eContainer();
-		if (container != null) {
-			if (container.eContainer() instanceof AbstractStatement) {
-				((AbstractStatement)container.eContainer()).setTested(false);
-				TestStatement.setPathTested(TestStatement.getPathLeaf(container), false);
-			}
-		}
-		
-		if (id.equals(ID_PRE_MOD) || id.equals(ID_POST_MOD) || id.equals(ID_OTHER_MOD)) {
-			String[] split = value.trim().replace("modifiable(", "").replace(");", "").split(",");
-			condition.getModifiables().clear();
-			for (String s : split) {
-				if (!s.equals("")) condition.getModifiables().add(s.trim());
-			}
-			UpdateConditionsOfChildren.updateConditionsofChildren(condition);
-			updatePictogramElement(context.getPictogramElement());
-			return;
-		}
-		condition.setName(value.trim());
-		URI peURI =	context.getPictogramElement().eResource().getURI();
-		if (condition.eContainer() instanceof ModelClass) {
-			Shape shape = (Shape)context.getPictogramElement();
-			Text text = (Text)shape.getGraphicsAlgorithm();
-			text.setValue("{" + condition.getName() + "}");
-		} else if (!(condition.eContainer() instanceof GlobalConditions)) {
-			if (peURI.lastSegment().contains(FeatureUtil.getInstance().getCallingClass(peURI))) { //change from CbCClass
-				try {
-					condition.eResource().setTrackingModification(true);
-					condition.eResource().save(Collections.EMPTY_MAP);
-				} catch (IOException e) {
-					e.printStackTrace();
-				}
-			}
-			
-			//Start of IFbC
-			final IProject project = GetProjectUtil.getProjectForDiagram(getDiagram());
-			final Lattice lattice = Lattices.getLatticeForProject(project);
-			if (lattice != null) {
-				for (Shape shape : getDiagram().getChildren()) {
-					Object obj = getBusinessObjectForPictogramElement(shape);
-					if (obj instanceof CbCFormula) {
-						CbCFormula formula = (CbCFormula) obj;
-						final AbstractStatement statement;
-						
-						// CbCFormula or AbstractStatement?
-						if (formula.getPostCondition() == condition) {
-							statement = formula.getStatement();
-						} else {
-							statement = findStatementForCondition(condition, formula);
-						}
-						try {
-							UpdateInformationFlow.updateInformationFlow(project.getName(), statement, lattice);
-						} catch (IFbCException e) {
-							// TODO Auto-generated catch block
-							e.printStackTrace();
-						}
-					}
-				}
-			}
-
-			try {
-				if (project.hasNature("de.ovgu.featureide.core.featureProjectNature")) {
-					UpdateOriginalCallsToProve.updateOriginalCallsToProve(condition);
-					UpdateMethodCallsToProve.updateMethodCallsToProve(condition);
-					UpdateContractsToProve.updateContractsToProve(condition);
-				}
-			} catch (CoreException e) {
-				e.printStackTrace();
-			}
-			
->>>>>>> master
-			UpdateConditionsOfChildren.updateConditionsofChildren(condition);
-		} else if (condition.eContainer() instanceof GlobalConditions) {
-			CbCFormula formula = null;
-			for (Shape shape : getDiagram().getChildren()) {
-				Object obj = getBusinessObjectForPictogramElement(shape);
-				if (obj instanceof CbCFormula) {
-					formula = (CbCFormula) obj;
-					formula.setProven(false);
-<<<<<<< HEAD
-=======
-					formula.setTested(false);
-					TestStatement.setPathTested(formula.getStatement(), false);
->>>>>>> master
-					UpdateConditionsOfChildren.setAllStatementsUnproven(formula.getStatement());
-				}
-			}
-		}
-		updatePictogramElement(context.getPictogramElement());
-	}
-
-	@Override
-	public boolean canRemove(IRemoveContext context) {
-		Shape shape = (Shape) context.getPictogramElement();
-		if (shape.getGraphicsAlgorithm() instanceof Text) {
-			Text text = (Text) shape.getGraphicsAlgorithm();
-			if (text.getValue().trim().endsWith("inherited")) {
-				return false;
-			}
-		}
-		return true;
-	}
-	
-	@Override
-	public boolean canDelete(IDeleteContext context) {
-		Shape shape = (Shape) context.getPictogramElement();
-		if (shape.getGraphicsAlgorithm() instanceof Text) {
-			Text text = (Text) shape.getGraphicsAlgorithm();
-			if (text.getValue().trim().endsWith("inherited")) {
-				return false;
-			}
-		}
-		return true;
-	}
-	
-	@Override
-	public void delete(IDeleteContext context) {
-		Shape shape = (Shape) context.getPictogramElement();
-		ContainerShape container = shape.getContainer();
-
-		Condition condition = (Condition) getBusinessObjectForPictogramElement(context.getPictogramElement());
-		if (condition.eContainer() != null && (condition.eContainer() instanceof GlobalConditions) || condition.eContainer() instanceof ModelClass) {
-			int indexToDelete = getIndex(shape.getGraphicsAlgorithm());
-
-			for (Shape childShape : container.getChildren()) {
-				if (getIndex(childShape.getGraphicsAlgorithm()) > indexToDelete) {
-					setIndex(childShape.getGraphicsAlgorithm(), getIndex(childShape.getGraphicsAlgorithm()) - 1);
-				}
-			}
-			if (condition.eContainer() instanceof ModelClass) {
-				super.delete(context);
-				layoutPictogramElement(container);
-				return;
-			}
-			super.delete(context);
-			layoutPictogramElement(container);
-		} else {
-			super.delete(context);
-		}
-		CbCFormula formula = null;
-		for (Shape childShape : getDiagram().getChildren()) {
-			Object obj = getBusinessObjectForPictogramElement(childShape);
-			if (obj instanceof CbCFormula) {
-				formula = (CbCFormula) obj;
-			}
-		}
-		formula.setProven(false);
-<<<<<<< HEAD
-		UpdateConditionsOfChildren.setAllStatementsUnproven(formula.getStatement());
-	}
-=======
-		formula.setTested(false);
-		UpdateConditionsOfChildren.setAllStatementsUnproven(formula.getStatement());
-	}
-	
-	private AbstractStatement findStatementForCondition(Condition condition, CbCFormula formula) {
-		return findStatementForCondition(condition, formula.getStatement().getRefinement());
-	}
-	
-	private AbstractStatement findStatementForCondition(Condition condition, AbstractStatement statement) {
-		if (statement instanceof SelectionStatement) {
-			final SelectionStatement selection = (SelectionStatement) statement;
-			for (Condition guard : selection.getGuards()) {
-				if (guard == condition) {
-					return selection;
-				}
-			}
-			
-			for (AbstractStatement command : selection.getCommands()) {
-				final AbstractStatement returnValue = findStatementForCondition(condition, command);
-				if (returnValue != null) {
-					return returnValue;
-				}
-			}
-			
-			return null;
-		}
-		
-		if (statement instanceof SmallRepetitionStatement) {
-			final SmallRepetitionStatement repetition = (SmallRepetitionStatement) statement;
-			
-			if (repetition.getGuard() == condition) {
-				return repetition;
-			}
-			
-			if (repetition.getLoopStatement() != null) {
-				final AbstractStatement returnValue = findStatementForCondition(condition, repetition.getLoopStatement());
-				if (returnValue != null) {
-					return returnValue;
-				}
-			}
-		}
-		
-		if (statement instanceof CompositionStatement) {
-			final CompositionStatement composition = (CompositionStatement) statement;
-			final AbstractStatement firstResult = findStatementForCondition(condition, composition.getFirstStatement());
-			if (firstResult != null) {
-				return firstResult;
-			}
-			
-			return findStatementForCondition(condition, composition.getSecondStatement());
-		}
-		
-		
-		
-		return null;
-	}
->>>>>>> master
-}
diff --git a/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/ConnectionPattern.java.orig b/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/ConnectionPattern.java.orig
deleted file mode 100644
index 9d0511a1a..000000000
--- a/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/ConnectionPattern.java.orig
+++ /dev/null
@@ -1,231 +0,0 @@
-package de.tu_bs.cs.isf.cbc.tool.patterns;
-
-<<<<<<< HEAD
-=======
-import org.eclipse.core.resources.IProject;
->>>>>>> master
-import org.eclipse.graphiti.features.context.IAddConnectionContext;
-import org.eclipse.graphiti.features.context.IAddContext;
-import org.eclipse.graphiti.features.context.ICreateConnectionContext;
-import org.eclipse.graphiti.features.context.impl.AddConnectionContext;
-import org.eclipse.graphiti.mm.GraphicsAlgorithmContainer;
-import org.eclipse.graphiti.mm.algorithms.Polyline;
-import org.eclipse.graphiti.mm.pictograms.Anchor;
-import org.eclipse.graphiti.mm.pictograms.Connection;
-import org.eclipse.graphiti.mm.pictograms.ConnectionDecorator;
-import org.eclipse.graphiti.mm.pictograms.ContainerShape;
-import org.eclipse.graphiti.mm.pictograms.PictogramElement;
-import org.eclipse.graphiti.mm.pictograms.Shape;
-import org.eclipse.graphiti.pattern.AbstractConnectionPattern;
-import org.eclipse.graphiti.services.Graphiti;
-import org.eclipse.graphiti.services.IGaService;
-import org.eclipse.graphiti.services.IPeCreateService;
-import org.eclipse.graphiti.util.IColorConstant;
-
-import de.tu_bs.cs.isf.cbc.cbcmodel.AbstractStatement;
-import de.tu_bs.cs.isf.cbc.cbcmodel.CbCFormula;
-import de.tu_bs.cs.isf.cbc.cbcmodel.impl.AbstractStatementImpl;
-import de.tu_bs.cs.isf.cbc.cbcmodel.impl.ReturnStatementImpl;
-import de.tu_bs.cs.isf.cbc.cbcmodel.impl.SkipStatementImpl;
-<<<<<<< HEAD
-import de.tu_bs.cs.isf.cbc.tool.helper.UpdateConditionsOfChildren;
-=======
-import de.tu_bs.cs.isf.cbc.parser.exceptions.IFbCException;
-import de.tu_bs.cs.isf.cbc.tool.helper.GetProjectUtil;
-import de.tu_bs.cs.isf.cbc.tool.helper.UpdateInformationFlow;
-import de.tu_bs.cs.isf.cbc.util.UpdateConditionsOfChildren;
-import de.tu_bs.cs.isf.lattice.Lattice;
-import de.tu_bs.cs.isf.lattice.Lattices;
->>>>>>> master
-
-/**
- * Class that creates the graphical representation of the parent hierarchy between Algorithms
- * @author Tobias
- *
- */
-public class ConnectionPattern extends AbstractConnectionPattern {
-	
-	@Override
-	public String getCreateName() {
-		return "Refinement";
-	}
-	
-	@Override
-	public String getCreateDescription() {
-		return "Firsty, select the abstract, then the refined.";
-	}
-
-	@Override
-	public boolean canAdd(IAddContext context) {
-		return context instanceof IAddConnectionContext;
-	}
-
-	@Override
-	public PictogramElement add(IAddContext context) {
-		IAddConnectionContext addConContext = (IAddConnectionContext) context;
-		IPeCreateService peCreateService = Graphiti.getPeCreateService();
-		IGaService gaService = Graphiti.getGaService();
-
-		Connection connection = peCreateService.createFreeFormConnection(getDiagram());
-		connection.setStart(addConContext.getSourceAnchor());
-		connection.setEnd(addConContext.getTargetAnchor());
-
-		Polyline polyline = gaService.createPlainPolyline(connection);
-		polyline.setForeground(manageColor(IColorConstant.BLACK));
-
-		ConnectionDecorator cd;
-		cd = peCreateService.createConnectionDecorator(connection, false, 1.0, true);
-		createArrow(cd);
-		
-		return connection;
-	}
-
-	@Override
-	public boolean canStartConnection(ICreateConnectionContext context) {
-		// Defines the start of the connection; allowed are objects that may
-		// contain other objects
-		Object domainObject = getBusinessObjectForPictogramElement(context.getSourcePictogramElement());
-		if (domainObject != null && (domainObject.getClass().equals(SkipStatementImpl.class) || domainObject.getClass().equals(ReturnStatementImpl.class))) {
-			return false;
-		}
-		if (domainObject != null && (domainObject instanceof AbstractStatement)) {
-			AbstractStatement statement = (AbstractStatement) domainObject;
-			if (statement.getRefinement() != null) {
-				return false;
-			}
-		}
-		if (domainObject != null && (domainObject instanceof CbCFormula)) {
-			CbCFormula formula = (CbCFormula) domainObject;
-			if (formula.getStatement().getRefinement() != null) {
-				return false;
-			}
-		}
-		if (domainObject != null && (domainObject instanceof AbstractStatement || domainObject instanceof CbCFormula)) {
-			Object parentContainerObject = getBusinessObjectForPictogramElement(((Shape)context.getSourcePictogramElement()).getContainer());
-			if (parentContainerObject != null && (parentContainerObject.getClass().equals(AbstractStatementImpl.class))) {
-				return false;
-			}
-			if (!(context.getSourcePictogramElement() instanceof ContainerShape)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	@Override
-	public boolean canCreate(ICreateConnectionContext context) {
-		PictogramElement sourcePictogramElement = context.getSourcePictogramElement();
-		PictogramElement targetPictogramElement = context.getTargetPictogramElement();
-
-		if (sourcePictogramElement == null || targetPictogramElement == null || targetPictogramElement.equals(getDiagram()) || !(targetPictogramElement instanceof ContainerShape)) {
-			return false;
-		}
-		
-		Object sourceDomainObject = getBusinessObjectForPictogramElement(sourcePictogramElement);
-		Object targetDomainObject = getBusinessObjectForPictogramElement(targetPictogramElement);
-
-		if (sourceDomainObject instanceof CbCFormula) {
-			sourceDomainObject = ((CbCFormula) sourceDomainObject).getStatement();
-		}
-		if (targetDomainObject instanceof CbCFormula) {
-			return false;
-		}
-		if (sourceDomainObject instanceof AbstractStatement && targetDomainObject instanceof AbstractStatement) {
-			AbstractStatement targetStatement = (AbstractStatement) targetDomainObject;
-			AbstractStatement sourceStatement = (AbstractStatement) sourceDomainObject;
-			if (checkLoop(sourceStatement, targetStatement)) {
-				return false;
-			}
-			if (sourceStatement.getRefinement() != null) {
-				return false;
-			}
-			if (targetStatement.getParent() != null) {
-				return false;
-			}
-			if (sourceStatement.equals(targetStatement)) {
-				return false;
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * checks if the connection creates a loop in the taxonomy
-	 * @param sourceStatement	the source statement of the connection
-	 * @param targetStatement	the target statement of the connection
-	 * @return	boolean if the connection creates a loop
-	 */
-	private boolean checkLoop(AbstractStatement sourceStatement, AbstractStatement targetStatement) {
-		boolean isParent = false;
-		if (targetStatement.getRefinement() != null) {
-			if (targetStatement.getRefinement().equals(sourceStatement)) {
-				return true;
-			}
-		}
-		if (sourceStatement.getParent() != null) {
-			isParent = checkLoop((AbstractStatement) sourceStatement.getParent(), targetStatement);
-			if (isParent) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	@Override
-	public Connection create(ICreateConnectionContext context) {
-		Anchor sourceAnchor = context.getSourceAnchor();
-		Anchor targetAnchor = context.getTargetAnchor();
-
-		if (targetAnchor == null) {
-			Shape shape = (Shape) context.getTargetPictogramElement();
-			while (shape.getAnchors().isEmpty()) {
-				shape = shape.getContainer();
-			}
-			targetAnchor = shape.getAnchors().get(0);
-		}
-
-		AbstractStatement sourceObject;
-		if (getBusinessObjectForPictogramElement(sourceAnchor.getParent()) instanceof CbCFormula) {
-			sourceObject = ((CbCFormula) getBusinessObjectForPictogramElement(sourceAnchor.getParent())).getStatement();
-		} else {
-			sourceObject = (AbstractStatement) getBusinessObjectForPictogramElement(sourceAnchor.getParent());
-		}
-		AbstractStatement targetObject = (AbstractStatement) getBusinessObjectForPictogramElement(targetAnchor.getParent());
-		
-		sourceObject.setRefinement(targetObject);
-		UpdateConditionsOfChildren.updateRefinedStatement(sourceObject, targetObject);
-		
-<<<<<<< HEAD
-=======
-		
-		//Start of IFbC
-		final IProject project = GetProjectUtil.getProjectForDiagram(getDiagram());
-		final Lattice lattice = Lattices.getLatticeForProject(project);
-		if (lattice != null) {
-			try {
-				UpdateInformationFlow.updateInformationFlow(project.getName(), sourceObject, lattice);
-			} catch (IFbCException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-		
->>>>>>> master
-		AddConnectionContext addContext = new AddConnectionContext(sourceAnchor, targetAnchor);
-		Connection connection = (Connection) getFeatureProvider().addIfPossible(addContext);
-
-		return connection;
-	}
-	
-	/**
-	 * Helper method to create an arrow at the end of the connection
-	 * @param gaContainer	the connection decorator
-	 * @return	A polyline that is formed like an arrow
-	 */
-	private Polyline createArrow(GraphicsAlgorithmContainer gaContainer) {
-		Polyline polyline = Graphiti.getGaCreateService().createPlainPolyline(gaContainer,
-				new int[] { -15, 10, 0, 0, -15, -10 });
-		polyline.setForeground(manageColor(IColorConstant.BLACK));
-		return polyline;
-	}
-}
diff --git a/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/FormulaPattern.java.orig b/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/FormulaPattern.java.orig
deleted file mode 100644
index bed3d7fb8..000000000
--- a/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/FormulaPattern.java.orig
+++ /dev/null
@@ -1,575 +0,0 @@
-package de.tu_bs.cs.isf.cbc.tool.patterns;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.graphiti.features.IReason;
-import org.eclipse.graphiti.features.context.IAddContext;
-import org.eclipse.graphiti.features.context.ICreateContext;
-import org.eclipse.graphiti.features.impl.Reason;
-import org.eclipse.graphiti.mm.algorithms.GraphicsAlgorithm;
-import org.eclipse.graphiti.mm.algorithms.Image;
-import org.eclipse.graphiti.mm.algorithms.MultiText;
-import org.eclipse.graphiti.mm.algorithms.Polyline;
-import org.eclipse.graphiti.mm.algorithms.RoundedRectangle;
-import org.eclipse.graphiti.mm.algorithms.Text;
-import org.eclipse.graphiti.mm.algorithms.styles.Font;
-import org.eclipse.graphiti.mm.algorithms.styles.Orientation;
-import org.eclipse.graphiti.mm.algorithms.styles.Point;
-import org.eclipse.graphiti.mm.pictograms.ContainerShape;
-import org.eclipse.graphiti.mm.pictograms.Diagram;
-import org.eclipse.graphiti.mm.pictograms.PictogramElement;
-import org.eclipse.graphiti.mm.pictograms.Shape;
-import org.eclipse.graphiti.pattern.IPattern;
-import org.eclipse.graphiti.pattern.id.IdLayoutContext;
-import org.eclipse.graphiti.pattern.id.IdPattern;
-import org.eclipse.graphiti.pattern.id.IdUpdateContext;
-import org.eclipse.graphiti.services.Graphiti;
-import org.eclipse.graphiti.services.IGaService;
-import org.eclipse.graphiti.services.IPeCreateService;
-import org.eclipse.graphiti.util.IColorConstant;
-import org.eclipse.graphiti.util.PredefinedColoredAreas;
-
-<<<<<<< HEAD
-import de.tu_bs.cs.isf.cbc.cbcclass.model.cbcclass.Method;
-=======
-import de.tu_bs.cs.isf.cbc.cbcclass.Method;
->>>>>>> master
-import de.tu_bs.cs.isf.cbc.cbcmodel.AbstractStatement;
-import de.tu_bs.cs.isf.cbc.cbcmodel.CbCFormula;
-import de.tu_bs.cs.isf.cbc.cbcmodel.CbcmodelFactory;
-import de.tu_bs.cs.isf.cbc.cbcmodel.Condition;
-import de.tu_bs.cs.isf.cbc.tool.diagram.CbCImageProvider;
-<<<<<<< HEAD
-import de.tu_bs.cs.isf.cbc.tool.model.CbcModelUtil;
-=======
-import de.tu_bs.cs.isf.cbc.util.CbcModelUtil;
->>>>>>> master
-
-/**
- * Class that creates the graphical representation of Conditions
- * 
- * @author Tobias
- *
- */
-public class FormulaPattern extends IdPattern implements IPattern {
-
-	private static final String ID_STATEMENT_TEXT = "statementNameText";
-	private static final String ID_NAME_TEXT = "nameText";
-	private static final String ID_PRE_TEXT = "preConditionText";
-<<<<<<< HEAD
-	private static final String ID_POST_TEXT = "postConditionText";
-=======
-	private static final String ID_PRE_MOD = "preConditionModifiables";
-	private static final String ID_POST_TEXT = "postConditionText";
-	private static final String ID_POST_MOD = "postConditionModifiables";
->>>>>>> master
-	private static final String ID_MAIN_RECTANGLE = "mainRectangle";
-	private static final String ID_IMAGE_PROVEN = "imageproven";
-	private static final String ID_IMAGE_INHERITANCE = "imageinheritance";
-	// Header:
-	private static final String ID_PRE_HEADER = "preHeader";
-	private static final String ID_ST_HEADER = "stHeader";
-	private static final String ID_POST_HEADER = "postHeader";
-	// lines:
-	private static final String ID_HOR1_LINE = "hor1Line";
-	private static final String ID_HOR2_LINE = "hor2Line";
-<<<<<<< HEAD
-=======
-	private static final String ID_HOR3_LINE = "hor3Line";
-	private static final String ID_HOR4_LINE = "hor4Line";
->>>>>>> master
-	private static final String ID_VER1_LINE = "ver1Line";
-	private static final String ID_VER2_LINE = "ver2Line";
-	
-	/**
-	 * Constructor of the class
-	 */
-	public FormulaPattern() {
-		super();
-	}
-
-	@Override
-	public String getCreateName() {
-		return "Formula";
-	}
-
-	@Override
-	public String getCreateDescription() {
-		return "Create a Formula.";
-	}
-
-	@Override
-	public boolean isMainBusinessObjectApplicable(Object mainBusinessObject) {
-		return mainBusinessObject instanceof CbCFormula;
-	}
-
-	@Override
-	public boolean canCreate(ICreateContext context) {
-		CbCFormula formula = null;
-		for (Shape shape : getDiagram().getChildren()) {
-			Object obj = getBusinessObjectForPictogramElement(shape);
-			if (obj instanceof CbCFormula) {
-				formula = (CbCFormula) obj;
-			}
-		}
-		if (formula != null)
-			return false;
-		return context.getTargetContainer() instanceof Diagram;
-	}
-
-	@Override
-	public Object[] create(ICreateContext context) {
-		CbCFormula formula = CbcmodelFactory.eINSTANCE.createCbCFormula();
-		formula.setName(getDiagram().getName());
-		AbstractStatement statement = CbcmodelFactory.eINSTANCE.createAbstractStatement();
-		statement.setName("statement");
-		formula.setStatement(statement);
-		Condition preCondition = CbcmodelFactory.eINSTANCE.createCondition();
-		preCondition.setName("pre");
-		statement.setPreCondition(preCondition);
-		Condition postCondition = CbcmodelFactory.eINSTANCE.createCondition();
-		postCondition.setName("post");
-		statement.setPostCondition(postCondition);
-		
-		// Use the following instead of the above line to store the model
-		// data in a seperate file parallel to the diagram file
-		try {
-			CbcModelUtil.saveFormulaToModelFile(formula, getDiagram());
-		} catch (CoreException | IOException e) {
-			e.printStackTrace();
-		}
-		addGraphicalRepresentation(context, formula);
-		return new Object[] { formula };
-	}
-
-	@Override
-	public boolean canAdd(IAddContext context) {
-		return super.canAdd(context) && context.getTargetContainer() instanceof Diagram;
-	}
-
-	@Override
-	public PictogramElement doAdd(IAddContext context) {
-		manageColor(IColorConstant.DARK_GREEN);
-<<<<<<< HEAD
-=======
-		manageColor(IColorConstant.LIGHT_ORANGE);
->>>>>>> master
-		Diagram targetDiagram = (Diagram) context.getTargetContainer();
-		CbCFormula addedFormula = (CbCFormula) context.getNewObject();
-		IPeCreateService peCreateService = Graphiti.getPeCreateService();
-		IGaService gaService = Graphiti.getGaService();
-
-<<<<<<< HEAD
-		int width = context.getWidth() <= 0 ? 300 : context.getWidth();
-		int height = context.getHeight() <= 0 ? 150 : context.getHeight();
-=======
-		int width = context.getWidth() <= 0 ? 400 : context.getWidth();
-		int height = context.getHeight() <= 0 ? 200 : context.getHeight();
->>>>>>> master
-		// header font:
-		Font headerFont = gaService.manageFont(getDiagram(), "Arial", 9, false, true);
-
-		// Main contents area
-		ContainerShape outerContainerShape = peCreateService.createContainerShape(targetDiagram, true);
-		RoundedRectangle mainRectangle = gaService.createRoundedRectangle(outerContainerShape, 20, 20);
-		mainRectangle.setFilled(true);
-		gaService.setRenderingStyle(mainRectangle, PredefinedColoredAreas.getBlueWhiteAdaptions());
-		mainRectangle.setForeground(manageColor(IColorConstant.RED));
-		mainRectangle.setLineWidth(2);
-		setId(mainRectangle, ID_MAIN_RECTANGLE);
-		gaService.setLocationAndSize(mainRectangle, context.getX(), context.getY(), width, height);
-
-		// create link and wire it
-		link(outerContainerShape, addedFormula);
-
-		// Statement name
-		Shape textShapePreCondition = peCreateService.createShape(outerContainerShape, true);
-		MultiText preConditionText = gaService.createMultiText(textShapePreCondition, "");
-		setId(preConditionText, ID_PRE_TEXT);
-		preConditionText.setValue("{" + addedFormula.getStatement().getPreCondition().getName() + "}");
-		preConditionText.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		preConditionText.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-<<<<<<< HEAD
-=======
-		
-		Shape textShapePreConditionMod = peCreateService.createShape(outerContainerShape, true);
-		MultiText preConditionTextMod = gaService.createMultiText(textShapePreConditionMod, "");
-		setId(preConditionTextMod, ID_PRE_MOD);
-		String modString = "";
-		for (String s : addedFormula.getStatement().getPreCondition().getModifiables()) {
-			modString += s + ", ";
-		}
-		preConditionTextMod.setValue("modifiable(" + (modString.equals("") ? "" : modString.substring(0, modString.length() - 2)) + ");");
-		preConditionTextMod.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		preConditionTextMod.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
->>>>>>> master
-
-		Shape textShapeStatement = peCreateService.createShape(outerContainerShape, true);
-		MultiText statementText = gaService.createMultiText(textShapeStatement, "");
-		setId(statementText, ID_STATEMENT_TEXT);
-		statementText.setValue(addedFormula.getStatement().getName());
-		statementText.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		statementText.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-
-		Shape textShapePostCondition = peCreateService.createShape(outerContainerShape, true);
-		MultiText postConditionText = gaService.createMultiText(textShapePostCondition, "");
-		postConditionText.setValue("{" + addedFormula.getStatement().getPostCondition().getName() + "}");
-		setId(postConditionText, ID_POST_TEXT);
-		postConditionText.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		postConditionText.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-<<<<<<< HEAD
-=======
-		
-		Shape textShapePostConditionMod = peCreateService.createShape(outerContainerShape, true);
-		MultiText postConditionTextMod = gaService.createMultiText(textShapePostConditionMod, "");
-		setId(postConditionTextMod, ID_POST_MOD);
-		modString = "";
-		for (String s : addedFormula.getStatement().getPostCondition().getModifiables()) {
-			modString += s + ", ";
-		}
-		postConditionTextMod.setValue("modifiable(" + (modString.equals("") ? "" : modString.substring(0, modString.length() - 2)) + ");");
-		postConditionTextMod.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		postConditionTextMod.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
->>>>>>> master
-
-		Shape textShapeName = peCreateService.createShape(outerContainerShape, false);
-		MultiText nameText = gaService.createMultiText(textShapeName, "Formula");
-		setId(nameText, ID_NAME_TEXT);
-		nameText.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		nameText.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		nameText.setFont(headerFont);
-
-		Shape proveShape = peCreateService.createShape(outerContainerShape, false);
-		Image image = gaService.createImage(proveShape, CbCImageProvider.IMG_UNPROVEN);
-		setId(image, ID_IMAGE_PROVEN);
-		
-		Shape inheritanceShape = peCreateService.createShape(outerContainerShape, false);
-		Image imageInheritance = gaService.createImage(inheritanceShape, CbCImageProvider.IMG_INHERITANCE);
-		setId(imageInheritance, ID_IMAGE_INHERITANCE);
-
-		// Header:
-		Shape preHeaderShape = peCreateService.createShape(outerContainerShape, false);
-		Text preHeader = gaService.createText(preHeaderShape, "precondition");
-		setId(preHeader, ID_PRE_HEADER);
-		preHeader.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		preHeader.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		preHeader.setFont(headerFont);
-
-		Shape postHeaderShape = peCreateService.createShape(outerContainerShape, false);
-		Text postHeader = gaService.createText(postHeaderShape, "postcondition");
-		setId(postHeader, ID_POST_HEADER);
-		postHeader.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		postHeader.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		postHeader.setFont(headerFont);
-
-		Shape stHeaderShape = peCreateService.createShape(outerContainerShape, false);
-		Text stHeader = gaService.createText(stHeaderShape, "statement");
-		setId(stHeader, ID_ST_HEADER);
-		stHeader.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		stHeader.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		stHeader.setFont(headerFont);
-		// lines:
-		Shape hor1LineShape = peCreateService.createShape(outerContainerShape, false);
-		Polyline hor1Polyline = gaService.createPolyline(hor1LineShape);
-		setId(hor1Polyline, ID_HOR1_LINE);
-
-		Shape hor2LineShape = peCreateService.createShape(outerContainerShape, false);
-		Polyline hor2Polyline = gaService.createPolyline(hor2LineShape);
-		setId(hor2Polyline, ID_HOR2_LINE);
-<<<<<<< HEAD
-=======
-		
-		Shape hor3LineShape = peCreateService.createShape(outerContainerShape, false);
-		Polyline hor3Polyline = gaService.createPolyline(hor3LineShape);
-		setId(hor3Polyline, ID_HOR3_LINE);
-		
-		Shape hor4LineShape = peCreateService.createShape(outerContainerShape, false);
-		Polyline hor4Polyline = gaService.createPolyline(hor4LineShape);
-		setId(hor4Polyline, ID_HOR4_LINE);
->>>>>>> master
-
-		Shape ver1LineShape = peCreateService.createShape(outerContainerShape, false);
-		Polyline ver1Polyline = gaService.createPolyline(ver1LineShape);
-		setId(ver1Polyline, ID_VER1_LINE);
-
-		Shape ver2LineShape = peCreateService.createShape(outerContainerShape, false);
-		Polyline ver2Polyline = gaService.createPolyline(ver2LineShape);
-		setId(ver2Polyline, ID_VER2_LINE);
-
-		peCreateService.createChopboxAnchor(textShapeStatement);
-
-		link(outerContainerShape, addedFormula);
-		link(getDiagram(), addedFormula);
-		link(textShapePreCondition, addedFormula.getStatement().getPreCondition());
-<<<<<<< HEAD
-		link(textShapeStatement, addedFormula.getStatement());
-		link(textShapePostCondition, addedFormula.getStatement().getPostCondition());
-=======
-		link(textShapePreConditionMod, addedFormula.getStatement().getPreCondition());
-		link(textShapeStatement, addedFormula.getStatement());
-		link(textShapePostCondition, addedFormula.getStatement().getPostCondition());
-		link(textShapePostConditionMod, addedFormula.getStatement().getPostCondition());
->>>>>>> master
-		link(proveShape, addedFormula);
-		link(inheritanceShape, addedFormula);
-		
-		return outerContainerShape;
-	}
-
-	@Override
-	protected boolean layout(IdLayoutContext context, String id) {
-		boolean changesDone = false;
-
-		GraphicsAlgorithm mainRectangle = context.getRootPictogramElement().getGraphicsAlgorithm();
-		GraphicsAlgorithm ga = context.getGraphicsAlgorithm();
-		int third = mainRectangle.getWidth() / 3;
-		// stable sizes from Name and Header save space when the diagram gets big!
-		int sizeName = 30; // size from Formular block
-		int sizeHeader = 20; // size from the Header
-		int positionHeader = 40; // position where the Header is
-		int sizeText = mainRectangle.getHeight() - positionHeader - sizeHeader; // size from the blocks (pre, statement, post)
-		int positionText = positionHeader + sizeHeader; // position from the blocks (pre, statement, post)
-<<<<<<< HEAD
-=======
-		int modThird = sizeText / 3;
->>>>>>> master
-
-		if (id.equals(ID_NAME_TEXT)) {
-			Graphiti.getGaService().setLocationAndSize(ga, 0, 5, mainRectangle.getWidth(), sizeName);
-			changesDone = true;
-		} else if (id.equals(ID_PRE_TEXT)) {
-<<<<<<< HEAD
-			Graphiti.getGaService().setLocationAndSize(ga, 0, positionText, third, sizeText);
-=======
-			Graphiti.getGaService().setLocationAndSize(ga, 0, positionText + modThird, third, sizeText - modThird);
-			changesDone = true;
-		} else if (id.equals(ID_PRE_MOD)) {
-			Graphiti.getGaService().setLocationAndSize(ga, 0, positionText, third, modThird);
->>>>>>> master
-			changesDone = true;
-		} else if (id.equals(ID_STATEMENT_TEXT)) {
-			Graphiti.getGaService().setLocationAndSize(ga, third, positionText, third, sizeText);
-			changesDone = true;
-		} else if (id.equals(ID_POST_TEXT)) {
-<<<<<<< HEAD
-			Graphiti.getGaService().setLocationAndSize(ga, third * 2, positionText, third, sizeText);
-=======
-			Graphiti.getGaService().setLocationAndSize(ga, third * 2, positionText + modThird, third, sizeText - modThird);
-			changesDone = true;
-		} else if (id.equals(ID_POST_MOD)) {
-			Graphiti.getGaService().setLocationAndSize(ga, third * 2, positionText, third, modThird);
->>>>>>> master
-			changesDone = true;
-		} else if (id.equals(ID_IMAGE_PROVEN)) {
-			Graphiti.getGaService().setLocationAndSize(ga, mainRectangle.getWidth() - 20, 10, 10, 10);
-			changesDone = true;
-		} else if (id.equals(ID_IMAGE_INHERITANCE)) {
-			Graphiti.getGaService().setLocationAndSize(ga, 10, 10, 19, 20);
-			changesDone = true;
-		} else if (id.equals(ID_PRE_HEADER)) {
-			Graphiti.getGaService().setLocationAndSize(ga, 0, positionHeader, third, sizeHeader);
-			changesDone = true;
-		} else if (id.equals(ID_ST_HEADER)) {
-			Graphiti.getGaService().setLocationAndSize(ga, third, positionHeader, third, sizeHeader);
-			changesDone = true;
-		} else if (id.equals(ID_POST_HEADER)) {
-			Graphiti.getGaService().setLocationAndSize(ga, third * 2, positionHeader, third, sizeHeader);
-			changesDone = true;
-		} else if (id.equals(ID_HOR1_LINE)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService()
-					.createPointList(new int[] { 0, positionHeader, mainRectangle.getWidth(), positionHeader });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		} else if (id.equals(ID_HOR2_LINE)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService().createPointList(new int[] { 0, positionHeader + sizeHeader,
-					mainRectangle.getWidth(), positionHeader + sizeHeader });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-<<<<<<< HEAD
-=======
-		} else if (id.equals(ID_HOR3_LINE)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService().createPointList(new int[] { 0, positionText + modThird,
-					third, positionText + modThird });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		} else if (id.equals(ID_HOR4_LINE)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService().createPointList(new int[] { third * 2, positionText + modThird,
-					mainRectangle.getWidth(), positionText + modThird });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
->>>>>>> master
-		} else if (id.equals(ID_VER1_LINE)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService()
-					.createPointList(new int[] { third, positionHeader, third, mainRectangle.getHeight() });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		} else if (id.equals(ID_VER2_LINE)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService()
-					.createPointList(new int[] { third * 2, positionHeader, third * 2, mainRectangle.getHeight() });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		}
-
-		return changesDone;
-	}
-
-	@Override
-	protected IReason updateNeeded(IdUpdateContext context, String id) {
-		if (id.equals(ID_MAIN_RECTANGLE)) {
-			RoundedRectangle rectangle = (RoundedRectangle) context.getGraphicsAlgorithm();
-			CbCFormula domainObject = (CbCFormula) context.getDomainObject();
-			AbstractStatement statement = domainObject.getStatement();
-			AbstractStatement statementToCheck = null;
-			if (statement.getRefinement() != null) {
-				statementToCheck = statement.getRefinement();
-			} else {
-				statementToCheck = statement;
-			}
-<<<<<<< HEAD
-			if (statementToCheck.isProven() && ((rectangle.getForeground() != null
-					&& !rectangle.getForeground().equals(manageColor(IColorConstant.DARK_GREEN)))
-					|| rectangle.getForeground() == null)) {
-				return Reason.createTrueReason("Statement is proven. Expected green color.");
-			} else if (!statementToCheck.isProven() && ((rectangle.getForeground() != null
-					&& rectangle.getForeground().equals(manageColor(IColorConstant.DARK_GREEN)))
-					|| rectangle.getForeground() == null)) {
-				return Reason.createTrueReason("Statement is not proven. Expected red color.");
-=======
-			try {
-				if (statementToCheck.isProven() && ((rectangle.getForeground() != null
-						&& !rectangle.getForeground().equals(manageColor(IColorConstant.DARK_GREEN)))
-						|| rectangle.getForeground() == null)) {
-					return Reason.createTrueReason("Statement is proven. Expected green color.");
-				} else if (!statementToCheck.isProven() && statementToCheck.isTested() &&
-						((rectangle.getForeground() != null && !rectangle.getForeground().equals(manageColor(IColorConstant.LIGHT_ORANGE))) 
-								|| rectangle.getForeground() == null)) {
-					return Reason.createTrueReason("Statement is tested. Expected orange color.");
-				} else if (!statementToCheck.isProven() && !statementToCheck.isTested() && 
-						((rectangle.getForeground() != null && (rectangle.getForeground().equals(manageColor(IColorConstant.DARK_GREEN)) || rectangle.getForeground().equals(manageColor(IColorConstant.LIGHT_ORANGE)))) 
-								|| rectangle.getForeground() == null)) {
-					return Reason.createTrueReason("Statement is not proven. Expected red color.");
-				}  
-			} catch (Exception e) {
-				// TODO: find better solution than this exception handling to fix the manageColor error that happens when a diagram is opened.
->>>>>>> master
-			}
-		} else if (id.equals(ID_IMAGE_PROVEN)) {
-			CbCFormula domainObject = (CbCFormula) context.getDomainObject();
-			AbstractStatement statement = domainObject.getStatement();
-			AbstractStatement statementToCheck = null;
-			if (statement.getRefinement() != null) {
-				statementToCheck = statement.getRefinement();
-			} else {
-				statementToCheck = statement;
-			}
-			Image image = (Image) context.getGraphicsAlgorithm();
-			if (statementToCheck.isProven() && image.getId().equals(CbCImageProvider.IMG_UNPROVEN)) {
-				return Reason.createTrueReason("Statement is proven. Expected green color.");
-			} else if (!statementToCheck.isProven() && image.getId().equals(CbCImageProvider.IMG_PROVEN)) {
-				return Reason.createTrueReason("Statement is not proven. Expected red color.");
-			}
-		} else if (id.equals(ID_IMAGE_INHERITANCE)) {
-			CbCFormula domainObject = (CbCFormula) context.getDomainObject();
-			boolean superImpl = false;
-<<<<<<< HEAD
-			if (domainObject.getMethodObj() != null && domainObject.getMethodObj().getParentClass().getInheritsFrom() != null) {
-=======
-			if (domainObject.getMethodObj() != null && domainObject.getMethodObj().getParentClass() != null &&  domainObject.getMethodObj().getParentClass().getInheritsFrom() != null) {
->>>>>>> master
-				for (Method m : domainObject.getMethodObj().getParentClass().getInheritsFrom().getMethods()) {
-					if (m.getCbcStartTriple().getName().equals(domainObject.getName())) {
-						superImpl = true;
-					}
-				}
-			}
-			Image image = (Image) context.getGraphicsAlgorithm();
-			if (superImpl && image.getTransparency().equals(1.0)) {
-				return Reason.createTrueReason("Method has super implementation. Expected inheritance symbol.");
-			} else if (!superImpl && image.getTransparency().equals(0.0)) {
-				return Reason.createTrueReason("Method has no super implementation. Did not expect inheritance symbol.");
-			}
-		}
-		return Reason.createFalseReason();
-	}
-
-	@Override
-	protected boolean update(IdUpdateContext context, String id) {
-		if (id.equals(ID_MAIN_RECTANGLE)) {
-			RoundedRectangle rectangle = (RoundedRectangle) context.getGraphicsAlgorithm();
-			CbCFormula domainObject = (CbCFormula) context.getDomainObject();
-			AbstractStatement statement = domainObject.getStatement();
-			AbstractStatement statementToCheck = null;
-			if (statement.getRefinement() != null) {
-				statementToCheck = statement.getRefinement();
-			} else {
-				statementToCheck = statement;
-			}
-			if (statementToCheck.isProven()) {
-				domainObject.setProven(true);
-				rectangle.setForeground(manageColor(IColorConstant.DARK_GREEN));
-<<<<<<< HEAD
-			} else {
-				domainObject.setProven(false);
-=======
-			} else if (statementToCheck.isTested()) {
-				domainObject.setTested(true);
-				rectangle.setForeground(manageColor(IColorConstant.LIGHT_ORANGE));
-			}  else {
-				domainObject.setProven(false);
-				domainObject.setTested(false);
->>>>>>> master
-				rectangle.setForeground(manageColor(IColorConstant.RED));
-			}
-			return true;
-		} else if (id.equals(ID_IMAGE_PROVEN)) {
-			CbCFormula domainObject = (CbCFormula) context.getDomainObject();
-			Image image = (Image) context.getGraphicsAlgorithm();
-			AbstractStatement statement = domainObject.getStatement();
-			AbstractStatement statementToCheck = null;
-			if (statement.getRefinement() != null) {
-				statementToCheck = statement.getRefinement();
-			} else {
-				statementToCheck = statement;
-			}
-			if (statementToCheck.isProven()) {
-				image.setId(CbCImageProvider.IMG_PROVEN);
-			} else {
-				image.setId(CbCImageProvider.IMG_UNPROVEN);
-			}
-		} else if (id.equals(ID_IMAGE_INHERITANCE)) {
-			CbCFormula domainObject = (CbCFormula) context.getDomainObject();
-			boolean superImpl = false;
-			if (domainObject.getMethodObj() != null && domainObject.getMethodObj().getParentClass().getInheritsFrom() != null) {
-				for (Method m : domainObject.getMethodObj().getParentClass().getInheritsFrom().getMethods()) {
-					if (m.getCbcStartTriple().getName().equals(domainObject.getName())) {
-						superImpl = true;
-					}
-				}
-			}
-			Image image = (Image) context.getGraphicsAlgorithm();
-			if (superImpl) {
-				image.setId(CbCImageProvider.IMG_INHERITANCE);
-				domainObject.setComment("This method has a super implementation!");
-				image.setTransparency(0.0);
-			} else {
-				domainObject.setComment("");
-				image.setTransparency(1.0);
-			}
-		}
-		return false;
-	}
-}
\ No newline at end of file
diff --git a/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/GlobalConditionsPattern.java.orig b/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/GlobalConditionsPattern.java.orig
deleted file mode 100644
index 1524f2a79..000000000
--- a/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/GlobalConditionsPattern.java.orig
+++ /dev/null
@@ -1,222 +0,0 @@
-package de.tu_bs.cs.isf.cbc.tool.patterns;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.graphiti.features.IReason;
-import org.eclipse.graphiti.features.context.IAddContext;
-import org.eclipse.graphiti.features.context.ICreateContext;
-import org.eclipse.graphiti.features.impl.Reason;
-import org.eclipse.graphiti.mm.algorithms.GraphicsAlgorithm;
-import org.eclipse.graphiti.mm.algorithms.MultiText;
-import org.eclipse.graphiti.mm.algorithms.Polyline;
-import org.eclipse.graphiti.mm.algorithms.RoundedRectangle;
-import org.eclipse.graphiti.mm.algorithms.Text;
-import org.eclipse.graphiti.mm.algorithms.styles.Font;
-import org.eclipse.graphiti.mm.algorithms.styles.Orientation;
-import org.eclipse.graphiti.mm.algorithms.styles.Point;
-import org.eclipse.graphiti.mm.pictograms.ContainerShape;
-import org.eclipse.graphiti.mm.pictograms.Diagram;
-import org.eclipse.graphiti.mm.pictograms.PictogramElement;
-import org.eclipse.graphiti.mm.pictograms.Shape;
-import org.eclipse.graphiti.pattern.IPattern;
-import org.eclipse.graphiti.pattern.id.IdLayoutContext;
-import org.eclipse.graphiti.pattern.id.IdPattern;
-import org.eclipse.graphiti.pattern.id.IdUpdateContext;
-import org.eclipse.graphiti.services.Graphiti;
-import org.eclipse.graphiti.services.IGaService;
-import org.eclipse.graphiti.services.IPeCreateService;
-import org.eclipse.graphiti.util.PredefinedColoredAreas;
-
-import de.tu_bs.cs.isf.cbc.cbcmodel.CbcmodelFactory;
-import de.tu_bs.cs.isf.cbc.cbcmodel.Condition;
-import de.tu_bs.cs.isf.cbc.cbcmodel.GlobalConditions;
-<<<<<<< HEAD
-import de.tu_bs.cs.isf.cbc.tool.model.CbcModelUtil;
-=======
-import de.tu_bs.cs.isf.cbc.util.CbcModelUtil;
->>>>>>> master
-
-/**
- * Class that creates the graphical representation of global conditions
- * @author Tobias
- *
- */
-public class GlobalConditionsPattern extends IdPattern implements IPattern {
-
-	private static final String ID_NAME_TEXT = "globalConditionsName";
-	private static final String ID_CONDITION_TEXT = "globalcondition";
-	private static final String ID_MAIN_RECTANGLE = "mainRectangle";
-	//line:
-	private static final String ID_HOR1_LINE = "hor1Line";
-
-
-	/**
-	 * Constructor of the class
-	 */
-	public GlobalConditionsPattern() {
-		super();
-	}
-	
-	@Override
-	public String getCreateName() {
-		return "Global Conditions";
-	}
-	
-	@Override
-	public String getCreateDescription() {
-		return "Create a list of global conditions.";
-	}
-
-	@Override
-	public boolean isMainBusinessObjectApplicable(Object mainBusinessObject) {
-		return mainBusinessObject instanceof GlobalConditions;
-	}
-
-	@Override
-	public boolean canCreate(ICreateContext context) {
-		GlobalConditions conds = null;
-		for (Shape shape : getDiagram().getChildren()) {
-			Object obj = getBusinessObjectForPictogramElement(shape);
-			if (obj instanceof GlobalConditions) {
-				conds = (GlobalConditions) obj;
-			}
-		}
-		if (conds != null) return false;
-		return context.getTargetContainer() instanceof Diagram;
-	}
-	
-	@Override
-	public Object[] create(ICreateContext context) {
-		GlobalConditions conditions = CbcmodelFactory.eINSTANCE.createGlobalConditions();
-		Condition condition = CbcmodelFactory.eINSTANCE.createCondition();
-		condition.setName("{}");
-		conditions.getConditions().add(condition);
-		
-		try {
-			CbcModelUtil.saveGlobalConditionsToModelFile(conditions, getDiagram());
-		} catch (CoreException | IOException e) {
-			e.printStackTrace();
-		}
-		
-		addGraphicalRepresentation(context, conditions);
-		return new Object[] { conditions };
-	}
-
-	@Override
-	public boolean canAdd(IAddContext context) {
-		return super.canAdd(context) && context.getTargetContainer() instanceof Diagram;
-	}
-
-	@Override
-	public PictogramElement doAdd(IAddContext context) {
-		
-		Diagram targetDiagram = (Diagram) context.getTargetContainer();
-		GlobalConditions addedGlobalConditions = (GlobalConditions) context.getNewObject();
-		IPeCreateService peCreateService = Graphiti.getPeCreateService();
-		IGaService gaService = Graphiti.getGaService();
-
-		int width = context.getWidth() <= 0 ? 200 : context.getWidth();
-        int height = context.getHeight() <= 0 ? 100 : context.getHeight();
-        
-        Font headerFont = gaService.manageFont(getDiagram(), "Arial", 9, false, true);
-        
-		// Main contents area
-		ContainerShape outerContainerShape = peCreateService.createContainerShape(targetDiagram, true);
-		RoundedRectangle mainRectangle = gaService.createRoundedRectangle(outerContainerShape, 20, 20);
-		mainRectangle.setFilled(true);
-		gaService.setRenderingStyle(mainRectangle, PredefinedColoredAreas.getBlueWhiteAdaptions());
-		setId(mainRectangle, ID_MAIN_RECTANGLE);
-		gaService.setLocationAndSize(mainRectangle,
-	            context.getX(), context.getY(), width, height);
-
-        // create link and wire it
-        link(outerContainerShape, addedGlobalConditions);
-
-		// method name
-		Shape nameTextShape = peCreateService.createShape(outerContainerShape, false);
-		Text conditionsNameText = gaService.createText(nameTextShape, "Global Conditions");
-		setId(conditionsNameText, ID_NAME_TEXT);
-		conditionsNameText.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		conditionsNameText.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		conditionsNameText.setFont(headerFont);
-		
-		//line:
-		Shape hor1Shape = peCreateService.createShape(outerContainerShape, false);
-		Polyline hor1line = gaService.createPolyline(hor1Shape);
-		setId(hor1line, ID_HOR1_LINE);
-		
-		link(outerContainerShape, addedGlobalConditions);
-		link(nameTextShape, addedGlobalConditions);
-
-		return outerContainerShape;
-	}
-
-	@Override
-	protected boolean layout(IdLayoutContext context, String id) {
-		boolean changesDone = false;
-		
-		GraphicsAlgorithm mainRectangle = context.getRootPictogramElement().getGraphicsAlgorithm();
-		GlobalConditions conditions = (GlobalConditions) getBusinessObjectForPictogramElement(context.getRootPictogramElement());
-		GraphicsAlgorithm ga = context.getGraphicsAlgorithm();
-		int height = mainRectangle.getHeight();
-		if (conditions.getConditions().size() >= 1) {
-			height = height / (conditions.getConditions().size() + 1);
-		}
-		
-		
-		if (id.equals(ID_NAME_TEXT)) {
-			Graphiti.getGaService().setLocationAndSize(ga, 0, 0, mainRectangle.getWidth(), height);
-			changesDone = true;
-		} else if (id.equals(ID_CONDITION_TEXT)) {
-			int index = getIndex(context.getGraphicsAlgorithm());
-			Graphiti.getGaService().setLocationAndSize(ga, 0, height * (index + 1), mainRectangle.getWidth(), height);
-			changesDone = true;
-		} else if (id.equals(ID_HOR1_LINE)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService().createPointList(
-					new int[] { 0, height, mainRectangle.getWidth(), height});
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		}
-
-		return changesDone;
-	}
-	
-	@Override
-	protected IReason updateNeeded(IdUpdateContext context, String id) {
-		if (id.equals(ID_MAIN_RECTANGLE)) {
-			ContainerShape containerShape = (ContainerShape) context.getPictogramElement();
-			GlobalConditions conditions = (GlobalConditions) context.getDomainObject();
-			if (containerShape.getChildren().size() - 2 != conditions.getConditions().size()) {
-				return Reason.createTrueReason("Number of Conditions differ. Expected: " + conditions.getConditions().size() 
-						+ " " + (containerShape.getChildren().size() - 2));
-			}
-		}
-		return Reason.createFalseReason();
-	}
-
-	@Override
-	protected boolean update(IdUpdateContext context, String id) {
-		if (id.equals(ID_MAIN_RECTANGLE)) {
-			EList<Condition> conditions = ((GlobalConditions) context.getDomainObject()).getConditions();
-			while (((ContainerShape) context.getPictogramElement()).getChildren().size() - 2 < conditions.size()) {
-				int newIndex = ((ContainerShape) context.getPictogramElement()).getChildren().size() - 2;
-				Condition condition = conditions.get(newIndex);
-				Shape shapeText = Graphiti.getPeCreateService().createShape((ContainerShape) context.getPictogramElement(), true);
-				MultiText conditionNameText = Graphiti.getGaService().createMultiText(shapeText, condition.getName());
-				setId(conditionNameText, ID_CONDITION_TEXT);
-				setIndex(conditionNameText, newIndex);
-				conditionNameText.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-				conditionNameText.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-				link(shapeText, condition);
-			}
-			return true;
-		}
-		return false;
-	}
-}
-
diff --git a/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/MethodStatementPattern.java.orig b/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/MethodStatementPattern.java.orig
deleted file mode 100644
index 9c27b16d7..000000000
--- a/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/MethodStatementPattern.java.orig
+++ /dev/null
@@ -1,605 +0,0 @@
-package de.tu_bs.cs.isf.cbc.tool.patterns;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Pattern;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.graphiti.features.IReason;
-import org.eclipse.graphiti.features.context.IAddContext;
-import org.eclipse.graphiti.features.context.ICreateContext;
-import org.eclipse.graphiti.features.context.IDeleteContext;
-import org.eclipse.graphiti.features.context.IDirectEditingContext;
-import org.eclipse.graphiti.features.impl.Reason;
-import org.eclipse.graphiti.mm.algorithms.GraphicsAlgorithm;
-import org.eclipse.graphiti.mm.algorithms.Image;
-import org.eclipse.graphiti.mm.algorithms.MultiText;
-import org.eclipse.graphiti.mm.algorithms.Polyline;
-import org.eclipse.graphiti.mm.algorithms.RoundedRectangle;
-import org.eclipse.graphiti.mm.algorithms.Text;
-import org.eclipse.graphiti.mm.algorithms.styles.Font;
-import org.eclipse.graphiti.mm.algorithms.styles.Orientation;
-import org.eclipse.graphiti.mm.algorithms.styles.Point;
-import org.eclipse.graphiti.mm.pictograms.ContainerShape;
-import org.eclipse.graphiti.mm.pictograms.Diagram;
-import org.eclipse.graphiti.mm.pictograms.PictogramElement;
-import org.eclipse.graphiti.mm.pictograms.Shape;
-import org.eclipse.graphiti.pattern.IPattern;
-import org.eclipse.graphiti.pattern.id.IdLayoutContext;
-import org.eclipse.graphiti.pattern.id.IdPattern;
-import org.eclipse.graphiti.pattern.id.IdUpdateContext;
-import org.eclipse.graphiti.services.Graphiti;
-import org.eclipse.graphiti.services.IGaService;
-import org.eclipse.graphiti.services.IPeCreateService;
-import org.eclipse.graphiti.services.IPeService;
-import org.eclipse.graphiti.util.IColorConstant;
-import org.eclipse.graphiti.util.PredefinedColoredAreas;
-
-import de.tu_bs.cs.isf.cbc.cbcmodel.AbstractStatement;
-import de.tu_bs.cs.isf.cbc.cbcmodel.CbcmodelFactory;
-import de.tu_bs.cs.isf.cbc.cbcmodel.Condition;
-import de.tu_bs.cs.isf.cbc.cbcmodel.JavaVariables;
-import de.tu_bs.cs.isf.cbc.cbcmodel.MethodStatement;
-import de.tu_bs.cs.isf.cbc.cbcmodel.SelectionStatement;
-import de.tu_bs.cs.isf.cbc.tool.diagram.CbCImageProvider;
-<<<<<<< HEAD
-import de.tu_bs.cs.isf.cbc.tool.helper.UpdateModifiableOfConditions;
-=======
-import de.tu_bs.cs.isf.cbc.tool.features.TestStatement;
-import de.tu_bs.cs.isf.cbc.tool.helper.UpdateModifiableOfConditions;
-import de.tu_bs.cs.isf.cbc.util.DiagramPartsExtractor;
->>>>>>> master
-import de.tu_bs.cs.isf.cbc.util.FileUtil;
-
-public class MethodStatementPattern extends IdPattern implements IPattern {
-
-	private static final String ID_NAME_TEXT = "statementText";
-	private static final String ID_PRE_TEXT = "preText";
-	private static final String ID_PRE_MOD = "preConditionModifiables";
-	private static final String ID_POST_TEXT = "postText";
-	private static final String ID_POST_MOD = "postConditionModifiables";
-	private static final String ID_MAIN_RECTANGLE = "mainRectangle";
-	private static final String ID_IMAGE_PROVEN = "imageproven";
-	// Headers:
-	private static final String ID_PRE_HEADER = "preHeader";
-	private static final String ID_POST_HEADER = "postHeader";
-	private static final String ID_NAME_HEADER = "statementHeader";
-	private static final String ID_NAME_HEADER2 = "statementHeader2";
-	// Separating lines:
-	private static final String ID_HEADER_SEPARATER = "headerSeparater";
-	private static final String ID_POST_SEP = "postSep";
-	private static final String ID_PRE_SEP = "preSep";
-	private static final String ID_HOR1_LINE = "hor1Line";
-	private static final String ID_HOR2_LINE = "hor2Line";
-
-	/**
-	 * Constructor of the class
-	 */
-	public MethodStatementPattern() {
-		super();
-	}
-
-	@Override
-	public String getCreateName() {
-		return "Method-Call Statement";
-	}
-
-	@Override
-	public String getCreateDescription() {
-		return "Create a Method Statement.";
-	}
-
-	@Override
-	public boolean isMainBusinessObjectApplicable(Object mainBusinessObject) {
-		return mainBusinessObject instanceof MethodStatement;
-	}
-
-	@Override
-	public boolean canCreate(ICreateContext context) {
-		return context.getTargetContainer() instanceof Diagram;
-	}
-
-	@Override
-	public Object[] create(ICreateContext context) {
-		MethodStatement statement = CbcmodelFactory.eINSTANCE.createMethodStatement();//
-		statement.setName("method();");
-		Condition pre = CbcmodelFactory.eINSTANCE.createCondition();
-		pre.setName("");
-		statement.setPreCondition(pre);
-		Condition post = CbcmodelFactory.eINSTANCE.createCondition();
-		post.setName("");
-		statement.setPostCondition(post);
-		addGraphicalRepresentation(context, statement);
-		return new Object[] { statement };
-	}
-
-	@Override
-	public boolean canAdd(IAddContext context) {
-		return super.canAdd(context) && context.getTargetContainer() instanceof Diagram;
-	}
-
-	@Override
-	public PictogramElement doAdd(IAddContext context) {
-		manageColor(IColorConstant.DARK_GREEN);
-<<<<<<< HEAD
-=======
-		manageColor(IColorConstant.LIGHT_ORANGE);
->>>>>>> master
-		Diagram targetDiagram = (Diagram) context.getTargetContainer();
-		MethodStatement addedStatement = (MethodStatement) context.getNewObject();
-		IPeCreateService peCreateService = Graphiti.getPeCreateService();
-		IGaService gaService = Graphiti.getGaService();
-
-<<<<<<< HEAD
-		int width = context.getWidth() <= 0 ? 300 : context.getWidth();
-		int height = context.getHeight() <= 0 ? 100 : context.getHeight();
-=======
-		int width = context.getWidth() <= 0 ? 350 : context.getWidth();
-		int height = context.getHeight() <= 0 ? 150 : context.getHeight();
->>>>>>> master
-		// Font:
-		Font headerFont = gaService.manageFont(getDiagram(), "Arial", 9, false, true);
-
-		// Main contents area
-		ContainerShape outerContainerShape = peCreateService.createContainerShape(targetDiagram, true);
-		RoundedRectangle mainRectangle = gaService.createRoundedRectangle(outerContainerShape, 20, 20);
-		mainRectangle.setFilled(true);
-		gaService.setRenderingStyle(mainRectangle, PredefinedColoredAreas.getBlueWhiteAdaptions());
-		mainRectangle.setForeground(manageColor(IColorConstant.RED));
-		mainRectangle.setLineWidth(2);
-		setId(mainRectangle, ID_MAIN_RECTANGLE);
-		gaService.setLocationAndSize(mainRectangle, context.getX(), context.getY(), width, height);
-
-		// create link and wire it
-		link(outerContainerShape, addedStatement);
-
-		// Statement name
-		Shape textShape = peCreateService.createShape(outerContainerShape, true);
-		MultiText statementNameText = gaService.createMultiText(textShape, "");
-		setId(statementNameText, ID_NAME_TEXT);
-		statementNameText.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		statementNameText.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-
-		Shape preShape = peCreateService.createShape(outerContainerShape, false);
-		MultiText preNameText = gaService.createMultiText(preShape,
-				"{" + addedStatement.getPreCondition().getName() + "}");
-		setId(preNameText, ID_PRE_TEXT);
-		preNameText.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		preNameText.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-<<<<<<< HEAD
-=======
-		
-		Shape textShapePreConditionMod = peCreateService.createShape(outerContainerShape, true);
-		MultiText preConditionTextMod = gaService.createMultiText(textShapePreConditionMod, "");
-		setId(preConditionTextMod, ID_PRE_MOD);
-		String modString = "";
-		for (String s : addedStatement.getPreCondition().getModifiables()) {
-			modString += s + ", ";
-		}
-		preConditionTextMod.setValue("modifiable(" + (modString.equals("") ? "" : modString.substring(0, modString.length() - 2)) + ");");
-		preConditionTextMod.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		preConditionTextMod.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
->>>>>>> master
-
-		Shape postShape = peCreateService.createShape(outerContainerShape, false);
-		MultiText postNameText = gaService.createMultiText(postShape,
-				"{" + addedStatement.getPostCondition().getName() + "}");
-		setId(postNameText, ID_POST_TEXT);
-		postNameText.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		postNameText.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-<<<<<<< HEAD
-=======
-		
-		Shape textShapePostConditionMod = peCreateService.createShape(outerContainerShape, true);
-		MultiText postConditionTextMod = gaService.createMultiText(textShapePostConditionMod, "");
-		setId(postConditionTextMod, ID_POST_MOD);
-		modString = "";
-		for (String s : addedStatement.getPostCondition().getModifiables()) {
-			modString += s + ", ";
-		}
-		postConditionTextMod.setValue("modifiable(" + (modString.equals("") ? "" : modString.substring(0, modString.length() - 2)) + ");");
-		postConditionTextMod.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		postConditionTextMod.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
->>>>>>> master
-
-		Shape proveShape = peCreateService.createShape(outerContainerShape, false);
-		Image image = gaService.createImage(proveShape, CbCImageProvider.IMG_UNPROVEN);
-		setId(image, ID_IMAGE_PROVEN);
-
-		// Header:---------------
-		Shape textHeader = peCreateService.createShape(outerContainerShape, false);
-		Text statementNameHeader = gaService.createText(textHeader, "Method-Call");
-		setId(statementNameHeader, ID_NAME_HEADER);
-		statementNameHeader.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		statementNameHeader.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		statementNameHeader.setFont(headerFont);
-
-		// Header:---------------
-		Shape textHeader2 = peCreateService.createShape(outerContainerShape, false);
-		Text statementNameHeader2 = gaService.createText(textHeader2, "Statement");
-		setId(statementNameHeader2, ID_NAME_HEADER2);
-		statementNameHeader2.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		statementNameHeader2.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		statementNameHeader2.setFont(headerFont);
-
-		Shape preHeader = peCreateService.createShape(outerContainerShape, false);
-		Text preNameHeader = gaService.createText(preHeader, "precondition");
-		setId(preNameHeader, ID_PRE_HEADER);
-		preNameHeader.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		preNameHeader.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		preNameHeader.setFont(headerFont);
-
-		Shape postHeader = peCreateService.createShape(outerContainerShape, false);
-		Text postNameHeader = gaService.createText(postHeader, "postcondition");
-		setId(postNameHeader, ID_POST_HEADER);
-		postNameHeader.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		postNameHeader.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		postNameHeader.setFont(headerFont);
-
-		// Separator:
-		Shape headerSepShape = peCreateService.createShape(outerContainerShape, false);
-		Polyline headerPolyline = gaService.createPolyline(headerSepShape);
-		setId(headerPolyline, ID_HEADER_SEPARATER);
-
-		Shape preSepShape = peCreateService.createShape(outerContainerShape, false);
-		Polyline prePolyline = gaService.createPolyline(preSepShape);
-		setId(prePolyline, ID_PRE_SEP);
-
-		Shape postSepShape = peCreateService.createShape(outerContainerShape, false);
-		Polyline postPolyline = gaService.createPolyline(postSepShape);
-		setId(postPolyline, ID_POST_SEP);
-<<<<<<< HEAD
-=======
-		
-		Shape hor1LineShape = peCreateService.createShape(outerContainerShape, false);
-		Polyline hor1Polyline = gaService.createPolyline(hor1LineShape);
-		setId(hor1Polyline, ID_HOR1_LINE);
-
-		Shape hor2LineShape = peCreateService.createShape(outerContainerShape, false);
-		Polyline hor2Polyline = gaService.createPolyline(hor2LineShape);
-		setId(hor2Polyline, ID_HOR2_LINE);
->>>>>>> master
-
-		peCreateService.createChopboxAnchor(outerContainerShape);
-		peCreateService.createChopboxAnchor(textShape);
-
-		link(outerContainerShape, addedStatement);
-		link(textShape, addedStatement);
-		link(preShape, addedStatement.getPreCondition());
-		link(textShapePreConditionMod, addedStatement.getPreCondition());
-		link(postShape, addedStatement.getPostCondition());
-		link(textShapePostConditionMod, addedStatement.getPostCondition());
-		link(proveShape, addedStatement);
-
-		return outerContainerShape;
-	}
-
-	@Override
-	protected boolean layout(IdLayoutContext context, String id) {
-		boolean changesDone = false;
-
-		GraphicsAlgorithm mainRectangle = context.getRootPictogramElement().getGraphicsAlgorithm();
-		GraphicsAlgorithm ga = context.getGraphicsAlgorithm();
-		int third = mainRectangle.getWidth() / 3;
-<<<<<<< HEAD
-=======
-		int thirdBlockHeight = (mainRectangle.getHeight() - 40)/3;
->>>>>>> master
-
-		if (id.equals(ID_NAME_TEXT)) {
-			Graphiti.getGaService().setLocationAndSize(ga, third, 40, third, mainRectangle.getHeight() - 40);
-			changesDone = true;
-		} else if (id.equals(ID_PRE_TEXT)) {
-			Graphiti.getGaService().setLocationAndSize(ga, 0, thirdBlockHeight+40, third, 2*thirdBlockHeight);
-			changesDone = true;
-		} else if (id.equals(ID_PRE_MOD)) {
-			Graphiti.getGaService().setLocationAndSize(ga, 0, 40, third, thirdBlockHeight);
-			changesDone = true;
-		} else if (id.equals(ID_POST_TEXT)) {
-<<<<<<< HEAD
-			Graphiti.getGaService().setLocationAndSize(ga, third * 2, 40, third, mainRectangle.getHeight() - 40);
-=======
-			Graphiti.getGaService().setLocationAndSize(ga, third * 2, thirdBlockHeight+40, third, 2*thirdBlockHeight);
-			changesDone = true;
-		} else if (id.equals(ID_POST_MOD)) {
-			Graphiti.getGaService().setLocationAndSize(ga, third * 2, 40, third, thirdBlockHeight);
->>>>>>> master
-			changesDone = true;
-		} else if (id.equals(ID_IMAGE_PROVEN)) {
-			Graphiti.getGaService().setLocationAndSize(ga, mainRectangle.getWidth() - 20, 10, 10, 10);
-			changesDone = true;
-			// Header:
-		} else if (id.equals(ID_NAME_HEADER)) {
-			Graphiti.getGaService().setLocationAndSize(ga, third, 5, third, 20); // mainrectangle anpassen
-			changesDone = true;
-		} else if (id.equals(ID_NAME_HEADER2)) {
-			Graphiti.getGaService().setLocationAndSize(ga, third, 20, third, 20); // mainrectangle anpassen
-			changesDone = true;
-		} else if (id.equals(ID_PRE_HEADER)) {
-			Graphiti.getGaService().setLocationAndSize(ga, 0, 20, third, 20);
-			changesDone = true;
-		} else if (id.equals(ID_POST_HEADER)) {
-			Graphiti.getGaService().setLocationAndSize(ga, third * 2, 20, third, 20);
-			changesDone = true;
-			// LINES:
-		} else if (id.equals(ID_HEADER_SEPARATER)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService()
-					.createPointList(new int[] { 0, 40, mainRectangle.getWidth(), 40 });
-<<<<<<< HEAD
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		} else if (id.equals(ID_POST_SEP)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService()
-					.createPointList(new int[] { third, 0, third, mainRectangle.getHeight() });
-=======
->>>>>>> master
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		} else if (id.equals(ID_PRE_SEP)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService()
-					.createPointList(new int[] { third * 2, 0, third * 2, mainRectangle.getHeight() });
-<<<<<<< HEAD
-=======
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		} else if (id.equals(ID_HOR1_LINE)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService()
-					.createPointList(new int[] { 0, thirdBlockHeight+40, third, thirdBlockHeight+40 });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		} else if (id.equals(ID_POST_SEP)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService()
-					.createPointList(new int[] { third, 0, third, mainRectangle.getHeight() });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		} else if (id.equals(ID_HOR2_LINE)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService()
-					.createPointList(new int[] { 2*third, thirdBlockHeight+40, mainRectangle.getWidth(), thirdBlockHeight+40 });
->>>>>>> master
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		}
-
-		return changesDone;
-	}
-
-	@Override
-	protected IReason updateNeeded(IdUpdateContext context, String id) {
-		if (context.getGraphicsAlgorithm() instanceof MultiText
-				&& context.getDomainObject() instanceof MethodStatement) {
-			MultiText nameText = (MultiText) context.getGraphicsAlgorithm();
-			MethodStatement domainObject = (MethodStatement) context.getDomainObject();
-			if (domainObject.getName() == null || !domainObject.getName().equals(nameText.getValue())) {
-				return Reason.createTrueReason("Name differs. Expected: '" + domainObject.getName() + "'");
-			}
-		} else if (id.equals(ID_MAIN_RECTANGLE)) {
-			RoundedRectangle rectangle = (RoundedRectangle) context.getGraphicsAlgorithm();
-			AbstractStatement domainObject = (AbstractStatement) context.getDomainObject();
-			if (domainObject.isProven() && ((rectangle.getForeground() != null
-					&& !rectangle.getForeground().equals(manageColor(IColorConstant.DARK_GREEN)))
-					|| rectangle.getForeground() == null)) {
-				return Reason.createTrueReason("Statement is proven. Expected green color.");
-<<<<<<< HEAD
-			} else if (!domainObject.isProven() && ((rectangle.getForeground() != null
-					&& rectangle.getForeground().equals(manageColor(IColorConstant.DARK_GREEN)))
-					|| rectangle.getForeground() == null)) {
-				return Reason.createTrueReason("Statement is not proven. Expected red color.");
-			}
-=======
-			} else if (!domainObject.isProven() && domainObject.isTested() &&
-					((rectangle.getForeground() != null && !rectangle.getForeground().equals(manageColor(IColorConstant.LIGHT_ORANGE))) 
-							|| rectangle.getForeground() == null)) {
-				return Reason.createTrueReason("Statement is tested. Expected orange color.");
-			} else if (!domainObject.isProven() && !domainObject.isTested() && 
-					((rectangle.getForeground() != null && (rectangle.getForeground().equals(manageColor(IColorConstant.DARK_GREEN)) || rectangle.getForeground().equals(manageColor(IColorConstant.LIGHT_ORANGE)))) 
-							|| rectangle.getForeground() == null)) {
-				return Reason.createTrueReason("Statement is not proven. Expected red color.");
-			}  
->>>>>>> master
-		} else if (id.equals(ID_IMAGE_PROVEN)) {
-			AbstractStatement domainObject = (AbstractStatement) context.getDomainObject();
-			Image image = (Image) context.getGraphicsAlgorithm();
-			if (domainObject.isProven() && image.getId().equals(CbCImageProvider.IMG_UNPROVEN)) {
-				return Reason.createTrueReason("Statement is proven. Expected green color.");
-			} else if (!domainObject.isProven() && image.getId().equals(CbCImageProvider.IMG_PROVEN)) {
-				return Reason.createTrueReason("Statement is not proven. Expected red color.");
-			}
-		}
-
-		return Reason.createFalseReason();
-	}
-
-	@Override
-	protected boolean update(IdUpdateContext context, String id) {
-		if (context.getGraphicsAlgorithm() instanceof MultiText
-				&& context.getDomainObject() instanceof AbstractStatement) {
-			MultiText nameText = (MultiText) context.getGraphicsAlgorithm();
-			MethodStatement domainObject = (MethodStatement) context.getDomainObject();
-			nameText.setValue(domainObject.getName());
-			return true;
-		} else if (id.equals(ID_MAIN_RECTANGLE)) {
-			RoundedRectangle rectangle = (RoundedRectangle) context.getGraphicsAlgorithm();
-			MethodStatement domainObject = (MethodStatement) context.getDomainObject();
-			if (domainObject.isProven()) {
-				rectangle.setForeground(manageColor(IColorConstant.DARK_GREEN));
-				if (domainObject.getParent() != null) {
-					IPeService pe = Graphiti.getPeService();
-					EObject[] objArray = { domainObject.getParent() };
-					Object[] obj = pe.getLinkedPictogramElements(objArray, getDiagram());
-					Shape pElement = (Shape) obj[0];
-					if (pElement.getContainer() != null)
-						updatePictogramElement(pElement.getContainer());
-				}
-<<<<<<< HEAD
-			} else {
-				rectangle.setForeground(manageColor(IColorConstant.RED));
-				if (domainObject.getParent() != null) {
-					IPeService pe = Graphiti.getPeService();
-=======
-			} else if (domainObject.isTested()) {
-				rectangle.setForeground(manageColor(IColorConstant.LIGHT_ORANGE));
-				if(domainObject.getParent()!= null) {
-					IPeService pe = Graphiti.getPeService();
-					EObject[] objArray = {domainObject.getParent()};
-					Object[] obj =  pe.getLinkedPictogramElements(objArray, getDiagram());
-					Shape pElement = (Shape) obj[0];
-					if (pElement.getContainer() != null) updatePictogramElement(pElement.getContainer());
-				}		
-			} else {
-				rectangle.setForeground(manageColor(IColorConstant.RED));
-				if (domainObject.getParent() != null) {
-					IPeService pe = Graphiti.getPeService();
->>>>>>> master
-					EObject[] objArray = { domainObject.getParent() };
-					Object[] obj = pe.getLinkedPictogramElements(objArray, getDiagram());
-					if (obj.length > 0) {
-						Shape pElement = (Shape) obj[0];
-						if (pElement.getContainer() != null)
-							updatePictogramElement(pElement.getContainer());
-					}
-				}
-			}
-			return true;
-		} else if (id.equals(ID_IMAGE_PROVEN)) {
-			MethodStatement domainObject = (MethodStatement) context.getDomainObject();
-			Image image = (Image) context.getGraphicsAlgorithm();
-			if (domainObject.isProven()) {
-				image.setId(CbCImageProvider.IMG_PROVEN);
-			} else {
-				image.setId(CbCImageProvider.IMG_UNPROVEN);
-			}
-		}
-		return false;
-	}
-
-	@Override
-	public int getEditingType() {
-		return TYPE_MULTILINETEXT;
-	}
-
-	@Override
-	public boolean canDirectEdit(IDirectEditingContext context) {
-		Object domainObject = getBusinessObjectForPictogramElement(context.getPictogramElement());
-		GraphicsAlgorithm ga = context.getGraphicsAlgorithm();
-		if (domainObject instanceof MethodStatement && ga instanceof MultiText) {
-			return true;
-		}
-		return false;
-	}
-
-	@Override
-	public String getInitialValue(IDirectEditingContext context) {
-		MethodStatement statement = (MethodStatement) getBusinessObjectForPictogramElement(
-				context.getPictogramElement());
-		return System.getProperty("line.separator") + statement.getName() + System.getProperty("line.separator");
-	}
-
-	@Override
-	public String checkValueValid(String value, IDirectEditingContext context) {
-		value = value.replaceAll("\n", "");
-		value = value.replaceAll("\r", "");
-		if (value == null || value.length() == 0) {
-			return "Statement must not be empty";
-		}
-		if (Pattern.matches(".*[a-zA-Z0-9]+[(].*[)].*", value) == false) {
-			return "Statement must contain a method-call";
-		}
-		if (Pattern.matches(".*original[(].*[)].*", value) == true) {
-			return "Please use an Original-Call Statement for an original-call";
-		}
-		if (!value.contains(";")) {
-			return "Statement must contain the end line character \";\"";
-		}
-		return null;
-	}
-	
-	private void updateParent(AbstractStatement statement) {
-		if (statement.getParent() != null) {
-			IPeService pe = Graphiti.getPeService();
-			EObject[] objArray = { statement.getParent() };
-			Object[] obj = pe.getLinkedPictogramElements(objArray, getDiagram());
-			if (obj.length > 0) {
-				Shape pElement = (Shape) obj[0];
-				if (pElement.getContainer() != null)
-					updatePictogramElement(pElement.getContainer());
-			}
-		}
-	}
-
-	@Override
-	public void setValue(String value, IDirectEditingContext context) {
-		MethodStatement statement = (MethodStatement) getBusinessObjectForPictogramElement(
-				context.getPictogramElement());
-		statement.setName(value.trim());
-		statement.setProven(false);
-<<<<<<< HEAD
-		JavaVariables vars = null;
-		for (Shape shape : getDiagram().getChildren()) {
-			Object obj = getBusinessObjectForPictogramElement(shape);
-			if (obj instanceof JavaVariables) {
-				vars = (JavaVariables) obj;
-			}
-		}
-		UpdateModifiableOfConditions.setVars(vars);
-		FileUtil.setApplicationUri(getDiagram().eResource().getURI());
-		UpdateModifiableOfConditions.updateAssignmentStatement(statement);
-=======
-		statement.setTested(false);
-		TestStatement.setPathTested(statement, false);
-		updateParent(statement);
-		DiagramPartsExtractor extractor = new DiagramPartsExtractor(getDiagram());
-		JavaVariables vars = extractor.getVars();
-		UpdateModifiableOfConditions.setVars(vars);
-		FileUtil.setApplicationUri(getDiagram().eResource().getURI());
-		UpdateModifiableOfConditions.updateAssignmentStatement(statement, new FileUtil(getDiagram().eResource().getURI().toPlatformString(true)));
->>>>>>> master
-		updatePictogramElement(context.getPictogramElement());
-	}
-
-	@Override
-	public void delete(IDeleteContext context) {
-		Shape shape = (Shape) context.getPictogramElement();
-		ContainerShape container = shape.getContainer();
-		MethodStatement statement = (MethodStatement) getBusinessObjectForPictogramElement(
-				context.getPictogramElement());
-		if (statement != null && statement.eContainer() != null
-				&& statement.eContainer() instanceof SelectionStatement) {
-			int indexToDelete = getIndex(shape.getGraphicsAlgorithm());
-			SelectionStatement selectionStatement = (SelectionStatement) statement.eContainer();
-			int indexInSelSt = selectionStatement.getCommands().indexOf(statement);
-			selectionStatement.getGuards().remove(indexInSelSt);
-			super.delete(context);
-			List<Shape> shapesToDelete = new ArrayList<Shape>();
-			for (Shape childShape : container.getChildren()) {
-				if (getIndex(childShape.getGraphicsAlgorithm()) == indexToDelete) {
-					shapesToDelete.add(childShape);
-				}
-			}
-			for (Shape deleteShape : shapesToDelete) {
-				EcoreUtil.delete(deleteShape, true);
-			}
-
-			for (Shape childShape : container.getChildren()) {
-				if (getIndex(childShape.getGraphicsAlgorithm()) > indexToDelete) {
-					setIndex(childShape.getGraphicsAlgorithm(), getIndex(childShape.getGraphicsAlgorithm()) - 1);
-				}
-			}
-			layoutPictogramElement(container);
-		} else {
-			super.delete(context);
-		}
-	}
-}
\ No newline at end of file
diff --git a/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/OriginalStatementPattern.java.orig b/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/OriginalStatementPattern.java.orig
deleted file mode 100644
index 82cfcf23c..000000000
--- a/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/OriginalStatementPattern.java.orig
+++ /dev/null
@@ -1,834 +0,0 @@
-package de.tu_bs.cs.isf.cbc.tool.patterns;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Pattern;
-
-<<<<<<< HEAD
-import org.eclipse.core.resources.IProject;
-=======
->>>>>>> master
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.graphiti.features.IReason;
-import org.eclipse.graphiti.features.context.IAddContext;
-import org.eclipse.graphiti.features.context.ICreateContext;
-import org.eclipse.graphiti.features.context.IDeleteContext;
-import org.eclipse.graphiti.features.context.IDirectEditingContext;
-import org.eclipse.graphiti.features.impl.Reason;
-import org.eclipse.graphiti.mm.algorithms.GraphicsAlgorithm;
-import org.eclipse.graphiti.mm.algorithms.Image;
-import org.eclipse.graphiti.mm.algorithms.MultiText;
-import org.eclipse.graphiti.mm.algorithms.Polyline;
-import org.eclipse.graphiti.mm.algorithms.RoundedRectangle;
-import org.eclipse.graphiti.mm.algorithms.Text;
-import org.eclipse.graphiti.mm.algorithms.styles.Font;
-import org.eclipse.graphiti.mm.algorithms.styles.Orientation;
-import org.eclipse.graphiti.mm.algorithms.styles.Point;
-import org.eclipse.graphiti.mm.pictograms.ContainerShape;
-import org.eclipse.graphiti.mm.pictograms.Diagram;
-import org.eclipse.graphiti.mm.pictograms.PictogramElement;
-import org.eclipse.graphiti.mm.pictograms.Shape;
-import org.eclipse.graphiti.pattern.IPattern;
-import org.eclipse.graphiti.pattern.id.IdLayoutContext;
-import org.eclipse.graphiti.pattern.id.IdPattern;
-import org.eclipse.graphiti.pattern.id.IdUpdateContext;
-import org.eclipse.graphiti.services.Graphiti;
-import org.eclipse.graphiti.services.IGaService;
-import org.eclipse.graphiti.services.IPeCreateService;
-import org.eclipse.graphiti.services.IPeService;
-import org.eclipse.graphiti.util.IColorConstant;
-import org.eclipse.graphiti.util.PredefinedColoredAreas;
-
-import de.tu_bs.cs.isf.cbc.cbcmodel.AbstractStatement;
-import de.tu_bs.cs.isf.cbc.cbcmodel.CbcmodelFactory;
-import de.tu_bs.cs.isf.cbc.cbcmodel.Condition;
-import de.tu_bs.cs.isf.cbc.cbcmodel.JavaVariables;
-<<<<<<< HEAD
-<<<<<<<< HEAD:de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/OriginalStatementPattern.java
-import de.tu_bs.cs.isf.cbc.cbcmodel.OriginalStatement;
-========
->>>>>>>> master:de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/StatementPattern.java.orig
-import de.tu_bs.cs.isf.cbc.cbcmodel.SelectionStatement;
-import de.tu_bs.cs.isf.cbc.parser.exceptions.IFbCException;
-import de.tu_bs.cs.isf.cbc.tool.diagram.CbCImageProvider;
-<<<<<<<< HEAD:de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/OriginalStatementPattern.java
-import de.tu_bs.cs.isf.cbc.tool.helper.UpdateModifiableOfConditions;
-import de.tu_bs.cs.isf.cbc.util.FileUtil;
-import de.tu_bs.cs.isf.cbc.util.CompareMethodBodies;
-
-public class OriginalStatementPattern extends IdPattern implements IPattern {
-
-========
-<<<<<<< HEAD
-import de.tu_bs.cs.isf.cbc.tool.helper.GetProjectUtil;
-=======
-import de.tu_bs.cs.isf.cbc.tool.helper.DiagramPartsExtractor;
->>>>>>> 8141930a (Added class DiagramPartsExtractor which eliminates tons of duplicated code.)
-import de.tu_bs.cs.isf.cbc.tool.helper.HighlightHelper;
-import de.tu_bs.cs.isf.cbc.tool.helper.UpdateInformationFlow;
-import de.tu_bs.cs.isf.cbc.tool.features.TestStatement;
-import de.tu_bs.cs.isf.cbc.tool.helper.UpdateModifiableOfConditions;
-import de.tu_bs.cs.isf.cbc.util.CompareMethodBodies;
-import de.tu_bs.cs.isf.cbc.util.FileUtil;
-import de.tu_bs.cs.isf.lattice.Lattice;
-import de.tu_bs.cs.isf.lattice.Lattices;
-
-/**
- * Class that creates the graphical representation of Conditions
- * 
- * @author Tobias
- *
- */
-public class StatementPattern extends IdPattern implements IPattern {
-
->>>>>>>> master:de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/StatementPattern.java.orig
-=======
-import de.tu_bs.cs.isf.cbc.cbcmodel.OriginalStatement;
-import de.tu_bs.cs.isf.cbc.cbcmodel.SelectionStatement;
-import de.tu_bs.cs.isf.cbc.tool.diagram.CbCImageProvider;
-import de.tu_bs.cs.isf.cbc.tool.features.TestStatement;
-import de.tu_bs.cs.isf.cbc.tool.helper.UpdateModifiableOfConditions;
-import de.tu_bs.cs.isf.cbc.util.FileUtil;
-import de.tu_bs.cs.isf.cbc.util.CompareMethodBodies;
-import de.tu_bs.cs.isf.cbc.util.DiagramPartsExtractor;
-
-public class OriginalStatementPattern extends IdPattern implements IPattern {
-
->>>>>>> master
-	private static final String ID_NAME_TEXT = "statementText";
-	private static final String ID_PRE_TEXT = "preText";
-	private static final String ID_PRE_MOD = "preConditionModifiables";
-	private static final String ID_POST_TEXT = "postText";
-	private static final String ID_POST_MOD = "postConditionModifiables";
-	private static final String ID_MAIN_RECTANGLE = "mainRectangle";
-	private static final String ID_IMAGE_PROVEN = "imageproven";
-	// Headers:
-	private static final String ID_PRE_HEADER = "preHeader";
-	private static final String ID_POST_HEADER = "postHeader";
-	private static final String ID_NAME_HEADER = "statementHeader";
-<<<<<<< HEAD
-<<<<<<<< HEAD:de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/OriginalStatementPattern.java
-	private static final String ID_NAME_HEADER2 = "statementHeader2";
-========
->>>>>>>> master:de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/StatementPattern.java.orig
-=======
-	private static final String ID_NAME_HEADER2 = "statementHeader2";
->>>>>>> master
-	// Separating lines:
-	private static final String ID_HEADER_SEPARATER = "headerSeparater";
-	private static final String ID_POST_SEP = "postSep";
-	private static final String ID_PRE_SEP = "preSep";
-	private static final String ID_HOR1_LINE = "hor1Line";
-	private static final String ID_HOR2_LINE = "hor2Line";
-
-	/**
-	 * Constructor of the class
-	 */
-	public OriginalStatementPattern() {
-		super();
-	}
-
-	@Override
-	public String getCreateName() {
-		return "Original-Call Statement";
-	}
-
-	@Override
-	public String getCreateDescription() {
-		return "Create an Original Statement.";
-	}
-
-	@Override
-	public boolean isMainBusinessObjectApplicable(Object mainBusinessObject) {
-		return mainBusinessObject instanceof OriginalStatement;
-	}
-
-	@Override
-	public boolean canCreate(ICreateContext context) {
-		return context.getTargetContainer() instanceof Diagram;
-	}
-
-	@Override
-	public Object[] create(ICreateContext context) {
-		OriginalStatement statement = CbcmodelFactory.eINSTANCE.createOriginalStatement();//
-		statement.setName("original();");
-		Condition pre = CbcmodelFactory.eINSTANCE.createCondition();
-		pre.setName("");
-		statement.setPreCondition(pre);
-		Condition post = CbcmodelFactory.eINSTANCE.createCondition();
-		post.setName("");
-		statement.setPostCondition(post);
-<<<<<<< HEAD
-<<<<<<<< HEAD:de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/OriginalStatementPattern.java
-========
-
->>>>>>>> master:de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/StatementPattern.java.orig
-=======
->>>>>>> master
-		addGraphicalRepresentation(context, statement);
-		return new Object[] { statement };
-	}
-
-	@Override
-	public boolean canAdd(IAddContext context) {
-		return super.canAdd(context) && context.getTargetContainer() instanceof Diagram;
-	}
-
-	@Override
-	public PictogramElement doAdd(IAddContext context) {
-		manageColor(IColorConstant.DARK_GREEN);
-<<<<<<< HEAD
-<<<<<<<< HEAD:de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/OriginalStatementPattern.java
-=======
-		manageColor(IColorConstant.LIGHT_ORANGE);
->>>>>>> master
-		Diagram targetDiagram = (Diagram) context.getTargetContainer();
-		OriginalStatement addedStatement = (OriginalStatement) context.getNewObject();
-		IPeCreateService peCreateService = Graphiti.getPeCreateService();
-		IGaService gaService = Graphiti.getGaService();
-
-<<<<<<< HEAD
-		int width = context.getWidth() <= 0 ? 300 : context.getWidth();
-		int height = context.getHeight() <= 0 ? 100 : context.getHeight();
-========
-		manageColor(IColorConstant.LIGHT_ORANGE);
-		
-		Diagram targetDiagram = (Diagram) context.getTargetContainer();
-		// System.out.println("contributorID:
-		// "+targetDiagram.getDiagramTypeId()+".PropertyContributor");
-		AbstractStatement addedStatement = (AbstractStatement) context.getNewObject();
-		IPeCreateService peCreateService = Graphiti.getPeCreateService();
-		IGaService gaService = Graphiti.getGaService();
-
-		int width = context.getWidth() <= 0 ? 350 : context.getWidth();
-		int height = context.getHeight() <= 0 ? 150 : context.getHeight();
->>>>>>>> master:de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/StatementPattern.java.orig
-=======
-		int width = context.getWidth() <= 0 ? 350 : context.getWidth();
-		int height = context.getHeight() <= 0 ? 150 : context.getHeight();
->>>>>>> master
-		// Font:
-		Font headerFont = gaService.manageFont(getDiagram(), "Arial", 9, false, true);
-
-		// Main contents area
-		ContainerShape outerContainerShape = peCreateService.createContainerShape(targetDiagram, true);
-		RoundedRectangle mainRectangle = gaService.createRoundedRectangle(outerContainerShape, 20, 20);
-		mainRectangle.setFilled(true);
-		gaService.setRenderingStyle(mainRectangle, PredefinedColoredAreas.getBlueWhiteAdaptions());
-		mainRectangle.setForeground(manageColor(IColorConstant.RED));
-		mainRectangle.setLineWidth(2);
-		setId(mainRectangle, ID_MAIN_RECTANGLE);
-		gaService.setLocationAndSize(mainRectangle, context.getX(), context.getY(), width, height);
-
-		// create link and wire it
-		link(outerContainerShape, addedStatement);
-
-		// Statement name
-		Shape textShape = peCreateService.createShape(outerContainerShape, true);
-		MultiText statementNameText = gaService.createMultiText(textShape, "");
-		setId(statementNameText, ID_NAME_TEXT);
-		statementNameText.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		statementNameText.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-
-		Shape preShape = peCreateService.createShape(outerContainerShape, false);
-		MultiText preNameText = gaService.createMultiText(preShape,
-				"{" + addedStatement.getPreCondition().getName() + "}");
-		setId(preNameText, ID_PRE_TEXT);
-		preNameText.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		preNameText.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-<<<<<<< HEAD
-<<<<<<<< HEAD:de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/OriginalStatementPattern.java
-========
-=======
->>>>>>> master
-		
-		Shape textShapePreConditionMod = peCreateService.createShape(outerContainerShape, true);
-		MultiText preConditionTextMod = gaService.createMultiText(textShapePreConditionMod, "");
-		setId(preConditionTextMod, ID_PRE_MOD);
-		String modString = "";
-		for (String s : addedStatement.getPreCondition().getModifiables()) {
-			modString += s + ", ";
-		}
-		preConditionTextMod.setValue("modifiable(" + (modString.equals("") ? "" : modString.substring(0, modString.length() - 2)) + ");");
-		preConditionTextMod.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		preConditionTextMod.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-<<<<<<< HEAD
->>>>>>>> master:de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/StatementPattern.java.orig
-=======
->>>>>>> master
-
-		Shape postShape = peCreateService.createShape(outerContainerShape, false);
-		MultiText postNameText = gaService.createMultiText(postShape,
-				"{" + addedStatement.getPostCondition().getName() + "}");
-		setId(postNameText, ID_POST_TEXT);
-		postNameText.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		postNameText.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		
-		Shape textShapePostConditionMod = peCreateService.createShape(outerContainerShape, true);
-		MultiText postConditionTextMod = gaService.createMultiText(textShapePostConditionMod, "");
-		setId(postConditionTextMod, ID_POST_MOD);
-		modString = "";
-		for (String s : addedStatement.getPostCondition().getModifiables()) {
-			modString += s + ", ";
-		}
-		postConditionTextMod.setValue("modifiable(" + (modString.equals("") ? "" : modString.substring(0, modString.length() - 2)) + ");");
-		postConditionTextMod.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		postConditionTextMod.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-
-		Shape proveShape = peCreateService.createShape(outerContainerShape, false);
-		Image image = gaService.createImage(proveShape, CbCImageProvider.IMG_UNPROVEN);
-		setId(image, ID_IMAGE_PROVEN);
-
-		// Header:---------------
-		Shape textHeader = peCreateService.createShape(outerContainerShape, false);
-		Text statementNameHeader = gaService.createText(textHeader, "Original-Call");
-		setId(statementNameHeader, ID_NAME_HEADER);
-		statementNameHeader.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		statementNameHeader.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		statementNameHeader.setFont(headerFont);
-
-<<<<<<< HEAD
-<<<<<<<< HEAD:de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/OriginalStatementPattern.java
-=======
->>>>>>> master
-		// Header:---------------
-		Shape textHeader2 = peCreateService.createShape(outerContainerShape, false);
-		Text statementNameHeader2 = gaService.createText(textHeader2, "Statement");
-		setId(statementNameHeader2, ID_NAME_HEADER2);
-		statementNameHeader2.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		statementNameHeader2.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		statementNameHeader2.setFont(headerFont);
-
-<<<<<<< HEAD
-========
->>>>>>>> master:de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/StatementPattern.java.orig
-=======
->>>>>>> master
-		Shape preHeader = peCreateService.createShape(outerContainerShape, false);
-		Text preNameHeader = gaService.createText(preHeader, "precondition");
-		setId(preNameHeader, ID_PRE_HEADER);
-		preNameHeader.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		preNameHeader.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		preNameHeader.setFont(headerFont);
-
-		Shape postHeader = peCreateService.createShape(outerContainerShape, false);
-		Text postNameHeader = gaService.createText(postHeader, "postcondition");
-		setId(postNameHeader, ID_POST_HEADER);
-		postNameHeader.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		postNameHeader.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		postNameHeader.setFont(headerFont);
-
-		// Separator:
-		Shape headerSepShape = peCreateService.createShape(outerContainerShape, false);
-		Polyline headerPolyline = gaService.createPolyline(headerSepShape);
-		setId(headerPolyline, ID_HEADER_SEPARATER);
-
-		Shape preSepShape = peCreateService.createShape(outerContainerShape, false);
-		Polyline prePolyline = gaService.createPolyline(preSepShape);
-		setId(prePolyline, ID_PRE_SEP);
-
-		Shape postSepShape = peCreateService.createShape(outerContainerShape, false);
-		Polyline postPolyline = gaService.createPolyline(postSepShape);
-		setId(postPolyline, ID_POST_SEP);
-<<<<<<< HEAD
-
-<<<<<<<< HEAD:de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/OriginalStatementPattern.java
-========
-=======
-		
->>>>>>> master
-		Shape hor1LineShape = peCreateService.createShape(outerContainerShape, false);
-		Polyline hor1Polyline = gaService.createPolyline(hor1LineShape);
-		setId(hor1Polyline, ID_HOR1_LINE);
-
-		Shape hor2LineShape = peCreateService.createShape(outerContainerShape, false);
-		Polyline hor2Polyline = gaService.createPolyline(hor2LineShape);
-		setId(hor2Polyline, ID_HOR2_LINE);
-<<<<<<< HEAD
-		
->>>>>>>> master:de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/StatementPattern.java.orig
-=======
-
->>>>>>> master
-		peCreateService.createChopboxAnchor(outerContainerShape);
-		peCreateService.createChopboxAnchor(textShape);
-
-		link(outerContainerShape, addedStatement);
-		link(textShape, addedStatement);
-		link(preShape, addedStatement.getPreCondition());
-		link(textShapePreConditionMod, addedStatement.getPreCondition());
-		link(postShape, addedStatement.getPostCondition());
-		link(textShapePostConditionMod, addedStatement.getPostCondition());
-		link(proveShape, addedStatement);
-
-		return outerContainerShape;
-	}
-
-	@Override
-	protected boolean layout(IdLayoutContext context, String id) {
-		boolean changesDone = false;
-
-		GraphicsAlgorithm mainRectangle = context.getRootPictogramElement().getGraphicsAlgorithm();
-		GraphicsAlgorithm ga = context.getGraphicsAlgorithm();
-		int third = mainRectangle.getWidth() / 3;
-<<<<<<< HEAD
-<<<<<<<< HEAD:de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/OriginalStatementPattern.java
-========
-		int thirdBlockHeight = (mainRectangle.getHeight() - 40)/3;
->>>>>>>> master:de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/StatementPattern.java.orig
-=======
-		int thirdBlockHeight = (mainRectangle.getHeight() - 40)/3;
->>>>>>> master
-
-		if (id.equals(ID_NAME_TEXT)) {
-			Graphiti.getGaService().setLocationAndSize(ga, third, 40, third, mainRectangle.getHeight() - 40);
-			changesDone = true;
-		} else if (id.equals(ID_PRE_TEXT)) {
-			Graphiti.getGaService().setLocationAndSize(ga, 0, thirdBlockHeight+40, third, 2*thirdBlockHeight);
-			changesDone = true;
-		} else if (id.equals(ID_PRE_MOD)) {
-			Graphiti.getGaService().setLocationAndSize(ga, 0, 40, third, thirdBlockHeight);
-			changesDone = true;
-		} else if (id.equals(ID_POST_TEXT)) {
-<<<<<<< HEAD
-<<<<<<<< HEAD:de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/OriginalStatementPattern.java
-			Graphiti.getGaService().setLocationAndSize(ga, third * 2, 40, third, mainRectangle.getHeight() - 40);
-========
-=======
->>>>>>> master
-			Graphiti.getGaService().setLocationAndSize(ga, third * 2, thirdBlockHeight+40, third, 2*thirdBlockHeight);
-			changesDone = true;
-		} else if (id.equals(ID_POST_MOD)) {
-			Graphiti.getGaService().setLocationAndSize(ga, third * 2, 40, third, thirdBlockHeight);
-<<<<<<< HEAD
->>>>>>>> master:de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/StatementPattern.java.orig
-=======
->>>>>>> master
-			changesDone = true;
-		} else if (id.equals(ID_IMAGE_PROVEN)) {
-			Graphiti.getGaService().setLocationAndSize(ga, mainRectangle.getWidth() - 20, 10, 10, 10);
-			changesDone = true;
-			// Header:
-		} else if (id.equals(ID_NAME_HEADER)) {
-<<<<<<< HEAD
-<<<<<<<< HEAD:de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/OriginalStatementPattern.java
-			Graphiti.getGaService().setLocationAndSize(ga, third, 5, third, 20); // mainrectangle anpassen
-			changesDone = true;
-		} else if (id.equals(ID_NAME_HEADER2)) {
-========
->>>>>>>> master:de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/StatementPattern.java.orig
-=======
-			Graphiti.getGaService().setLocationAndSize(ga, third, 5, third, 20); // mainrectangle anpassen
-			changesDone = true;
-		} else if (id.equals(ID_NAME_HEADER2)) {
->>>>>>> master
-			Graphiti.getGaService().setLocationAndSize(ga, third, 20, third, 20); // mainrectangle anpassen
-			changesDone = true;
-		} else if (id.equals(ID_PRE_HEADER)) {
-			Graphiti.getGaService().setLocationAndSize(ga, 0, 20, third, 20);
-			changesDone = true;
-		} else if (id.equals(ID_POST_HEADER)) {
-			Graphiti.getGaService().setLocationAndSize(ga, third * 2, 20, third, 20);
-			changesDone = true;
-			// LINES:
-		} else if (id.equals(ID_HEADER_SEPARATER)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService()
-					.createPointList(new int[] { 0, 40, mainRectangle.getWidth(), 40 });
-<<<<<<< HEAD
-<<<<<<<< HEAD:de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/OriginalStatementPattern.java
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		} else if (id.equals(ID_POST_SEP)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService()
-					.createPointList(new int[] { third, 0, third, mainRectangle.getHeight() });
-========
->>>>>>>> master:de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/StatementPattern.java.orig
-=======
->>>>>>> master
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		} else if (id.equals(ID_PRE_SEP)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService()
-					.createPointList(new int[] { third * 2, 0, third * 2, mainRectangle.getHeight() });
-<<<<<<< HEAD
-<<<<<<<< HEAD:de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/OriginalStatementPattern.java
-========
-=======
->>>>>>> master
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		} else if (id.equals(ID_HOR1_LINE)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService()
-					.createPointList(new int[] { 0, thirdBlockHeight+40, third, thirdBlockHeight+40 });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		} else if (id.equals(ID_POST_SEP)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService()
-					.createPointList(new int[] { third, 0, third, mainRectangle.getHeight() });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		} else if (id.equals(ID_HOR2_LINE)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService()
-					.createPointList(new int[] { 2*third, thirdBlockHeight+40, mainRectangle.getWidth(), thirdBlockHeight+40 });
-<<<<<<< HEAD
->>>>>>>> master:de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/StatementPattern.java.orig
-=======
->>>>>>> master
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		}
-
-		return changesDone;
-	}
-
-	@Override
-	protected IReason updateNeeded(IdUpdateContext context, String id) {
-		if (context.getGraphicsAlgorithm() instanceof MultiText
-<<<<<<< HEAD
-<<<<<<<< HEAD:de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/OriginalStatementPattern.java
-				&& context.getDomainObject() instanceof OriginalStatement) {
-========
-				&& context.getDomainObject() instanceof AbstractStatement) {
->>>>>>>> master:de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/StatementPattern.java.orig
-=======
-				&& context.getDomainObject() instanceof OriginalStatement) {
->>>>>>> master
-			MultiText nameText = (MultiText) context.getGraphicsAlgorithm();
-			OriginalStatement domainObject = (OriginalStatement) context.getDomainObject();
-			if (domainObject.getName() == null || !domainObject.getName().equals(nameText.getValue())) {
-				return Reason.createTrueReason("Name differs. Expected: '" + domainObject.getName() + "'");
-			}
-		} else if (id.equals(ID_MAIN_RECTANGLE)) {
-			RoundedRectangle rectangle = (RoundedRectangle) context.getGraphicsAlgorithm();
-			AbstractStatement domainObject = (AbstractStatement) context.getDomainObject();
-			if (domainObject.isProven() && ((rectangle.getForeground() != null
-					&& !rectangle.getForeground().equals(manageColor(IColorConstant.DARK_GREEN)))
-					|| rectangle.getForeground() == null)) {
-				return Reason.createTrueReason("Statement is proven. Expected green color.");
-<<<<<<< HEAD
-<<<<<<<< HEAD:de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/OriginalStatementPattern.java
-			} else if (!domainObject.isProven() && ((rectangle.getForeground() != null
-					&& rectangle.getForeground().equals(manageColor(IColorConstant.DARK_GREEN)))
-					|| rectangle.getForeground() == null)) {
-				return Reason.createTrueReason("Statement is not proven. Expected red color.");
-			}
-========
-=======
->>>>>>> master
-			} else if (!domainObject.isProven() && domainObject.isTested() &&
-					((rectangle.getForeground() != null && !rectangle.getForeground().equals(manageColor(IColorConstant.LIGHT_ORANGE))) 
-							|| rectangle.getForeground() == null)) {
-				return Reason.createTrueReason("Statement is tested. Expected orange color.");
-			} else if (!domainObject.isProven() && !domainObject.isTested() && 
-					((rectangle.getForeground() != null && (rectangle.getForeground().equals(manageColor(IColorConstant.DARK_GREEN)) || rectangle.getForeground().equals(manageColor(IColorConstant.LIGHT_ORANGE)))) 
-							|| rectangle.getForeground() == null)) {
-				return Reason.createTrueReason("Statement is not proven. Expected red color.");
-<<<<<<< HEAD
-			}  
->>>>>>>> master:de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/StatementPattern.java.orig
-=======
-			}
->>>>>>> master
-		} else if (id.equals(ID_IMAGE_PROVEN)) {
-			AbstractStatement domainObject = (AbstractStatement) context.getDomainObject();
-			Image image = (Image) context.getGraphicsAlgorithm();
-			if (domainObject.isProven() && image.getId().equals(CbCImageProvider.IMG_UNPROVEN)) {
-				return Reason.createTrueReason("Statement is proven. Expected green color.");
-			} else if (!domainObject.isProven() && image.getId().equals(CbCImageProvider.IMG_PROVEN)) {
-				return Reason.createTrueReason("Statement is not proven. Expected red color.");
-			}
-		}
-
-<<<<<<< HEAD
-		if(HighlightHelper.instance.needsInitialHighlightUpdate(context)) {
-			return Reason.createTrueReason("Element needs to be highlighted.");
-		}
-		
-=======
->>>>>>> master
-		return Reason.createFalseReason();
-	}
-
-	@Override
-	protected boolean update(IdUpdateContext context, String id) {
-		if (context.getGraphicsAlgorithm() instanceof MultiText
-				&& context.getDomainObject() instanceof AbstractStatement) {
-			MultiText nameText = (MultiText) context.getGraphicsAlgorithm();
-			OriginalStatement domainObject = (OriginalStatement) context.getDomainObject();
-			nameText.setValue(domainObject.getName());
-			return true;
-		} else if (id.equals(ID_MAIN_RECTANGLE)) {
-			RoundedRectangle rectangle = (RoundedRectangle) context.getGraphicsAlgorithm();
-			OriginalStatement domainObject = (OriginalStatement) context.getDomainObject();
-			if (domainObject.isProven()) {
-				rectangle.setForeground(manageColor(IColorConstant.DARK_GREEN));
-				if (domainObject.getParent() != null) {
-					IPeService pe = Graphiti.getPeService();
-					EObject[] objArray = { domainObject.getParent() };
-					Object[] obj = pe.getLinkedPictogramElements(objArray, getDiagram());
-					Shape pElement = (Shape) obj[0];
-					if (pElement.getContainer() != null)
-						updatePictogramElement(pElement.getContainer());
-<<<<<<< HEAD
-<<<<<<<< HEAD:de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/OriginalStatementPattern.java
-========
-				}
-			} else if (domainObject.isTested()) {
-				rectangle.setForeground(manageColor(IColorConstant.LIGHT_ORANGE));
-				if (domainObject.getParent() != null) {
-					IPeService pe = Graphiti.getPeService();
-					EObject[] objArray = { domainObject.getParent() };
-					Object[] obj = pe.getLinkedPictogramElements(objArray, getDiagram());
-					Shape pElement = (Shape) obj[0];
-					if (pElement.getContainer() != null)
-						updatePictogramElement(pElement.getContainer());
->>>>>>>> master:de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/StatementPattern.java.orig
-				}
-=======
-				}
-			} else if (domainObject.isTested()) {
-				rectangle.setForeground(manageColor(IColorConstant.LIGHT_ORANGE));
-				if(domainObject.getParent()!= null) {
-					IPeService pe = Graphiti.getPeService();
-					EObject[] objArray = {domainObject.getParent()};
-					Object[] obj =  pe.getLinkedPictogramElements(objArray, getDiagram());
-					Shape pElement = (Shape) obj[0];
-					if (pElement.getContainer() != null) updatePictogramElement(pElement.getContainer());
-				}		
->>>>>>> master
-			} else {
-				rectangle.setForeground(manageColor(IColorConstant.RED));
-				if (domainObject.getParent() != null) {
-					IPeService pe = Graphiti.getPeService();
-					EObject[] objArray = { domainObject.getParent() };
-					Object[] obj = pe.getLinkedPictogramElements(objArray, getDiagram());
-					if (obj.length > 0) {
-						Shape pElement = (Shape) obj[0];
-						if (pElement.getContainer() != null)
-							updatePictogramElement(pElement.getContainer());
-					}
-				}
-			}
-<<<<<<< HEAD
-			
-			HighlightHelper.instance.handleHighlightDrawing(context, rectangle);	
-
-			updateParent(domainObject);
-			return true;
-		} else if (id.equals(ID_IMAGE_PROVEN)) {
-<<<<<<<< HEAD:de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/OriginalStatementPattern.java
-			OriginalStatement domainObject = (OriginalStatement) context.getDomainObject();
-========
-			AbstractStatement domainObject = (AbstractStatement) context.getDomainObject();
->>>>>>>> master:de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/StatementPattern.java.orig
-=======
-			return true;
-		} else if (id.equals(ID_IMAGE_PROVEN)) {
-			OriginalStatement domainObject = (OriginalStatement) context.getDomainObject();
->>>>>>> master
-			Image image = (Image) context.getGraphicsAlgorithm();
-			if (domainObject.isProven()) {
-				image.setId(CbCImageProvider.IMG_PROVEN);
-			} else {
-				image.setId(CbCImageProvider.IMG_UNPROVEN);
-			}
-		}
-		return false;
-	}
-<<<<<<< HEAD
-	
-	private void updateParent(AbstractStatement statement) {
-		if (statement.getParent() != null) {
-			IPeService pe = Graphiti.getPeService();
-			EObject[] objArray = { statement.getParent() };
-			Object[] obj = pe.getLinkedPictogramElements(objArray, getDiagram());
-			if (obj.length > 0) {
-				Shape pElement = (Shape) obj[0];
-				if (pElement.getContainer() != null)
-					updatePictogramElement(pElement.getContainer());
-			}
-		}
-	}
-=======
->>>>>>> master
-
-	@Override
-	public int getEditingType() {
-		return TYPE_MULTILINETEXT;
-	}
-
-	@Override
-	public boolean canDirectEdit(IDirectEditingContext context) {
-		Object domainObject = getBusinessObjectForPictogramElement(context.getPictogramElement());
-		GraphicsAlgorithm ga = context.getGraphicsAlgorithm();
-		if (domainObject instanceof OriginalStatement && ga instanceof MultiText) {
-			return true;
-		}
-		return false;
-	}
-
-	@Override
-	public String getInitialValue(IDirectEditingContext context) {
-<<<<<<< HEAD
-<<<<<<<< HEAD:de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/OriginalStatementPattern.java
-		OriginalStatement statement = (OriginalStatement) getBusinessObjectForPictogramElement(
-========
-		AbstractStatement statement = (AbstractStatement) getBusinessObjectForPictogramElement(
->>>>>>>> master:de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/StatementPattern.java.orig
-=======
-		OriginalStatement statement = (OriginalStatement) getBusinessObjectForPictogramElement(
->>>>>>> master
-				context.getPictogramElement());
-		return System.getProperty("line.separator") + statement.getName() + System.getProperty("line.separator");
-	}
-
-	@Override
-	public String checkValueValid(String value, IDirectEditingContext context) {
-		value = value.replaceAll("\n", "");
-		value = value.replaceAll("\r", "");
-		if (value == null || value.length() == 0) {
-			return "Statement must not be empty";
-		}
-<<<<<<< HEAD
-		if (Pattern.matches(".*original[(].*[)].*", value) == true) {
-			return "Please use an Original-Call Statement for an original-call";
-		} else if (Pattern.matches(".*[a-zA-Z0-9]+[(].*[)].*", value) == true) {
-			return "Please use an Method-Call Statement for an method-call";
-		}
-=======
->>>>>>> master
-		if (value.contains(";") && !CompareMethodBodies.readAndTestMethodBodyWithJaMoPP2(value)) {
-			return "Statement has not the correct syntax.";
-		}
-
-		if (Pattern.matches(".*original[(].*[)].*", value) == false) {
-			return "Statement must contain an original-call";
-		} else if (Pattern.matches(".*original[(][^.[(]]*[)].*", value) == false) {
-			return "No nested method-calls in an original-call allowed.";
-		}
-		return null;
-	}
-
-	@Override
-	public void setValue(String value, IDirectEditingContext context) {
-<<<<<<< HEAD
-<<<<<<<< HEAD:de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/OriginalStatementPattern.java
-=======
->>>>>>> master
-		OriginalStatement statement = (OriginalStatement) getBusinessObjectForPictogramElement(
-				context.getPictogramElement());
-		statement.setName(value.trim());
-		statement.setProven(false);
-<<<<<<< HEAD
-		JavaVariables vars = null;
-		for (Shape shape : getDiagram().getChildren()) {
-			Object obj = getBusinessObjectForPictogramElement(shape);
-			if (obj instanceof JavaVariables) {
-				vars = (JavaVariables) obj;
-			}
-		}
-		UpdateModifiableOfConditions.setVars(vars);
-		FileUtil.setApplicationUri(getDiagram().eResource().getURI());
-		UpdateModifiableOfConditions.updateAssignmentStatement(statement);
-========
-		AbstractStatement statement = (AbstractStatement) getBusinessObjectForPictogramElement(
-				context.getPictogramElement());
-		statement.setName(value.trim());
-		statement.setProven(false);
-		statement.setTested(false);
-		TestStatement.setPathTested(statement, false);
-		updateParent(statement);
-		
-		DiagramPartsExtractor extractor = new DiagramPartsExtractor(getDiagram());
-		JavaVariables vars = extractor.getVars();
-		UpdateModifiableOfConditions.setVars(vars);
-		UpdateModifiableOfConditions.updateAssignmentStatement(statement, new FileUtil(getDiagram().eResource().getURI().toPlatformString(true)));
-		
-		//Start of IFbC
-		final IProject project = GetProjectUtil.getProjectForDiagram(getDiagram());
-		final Lattice lattice = Lattices.getLatticeForProject(project);
-		if (lattice != null) {
-			try {
-				UpdateInformationFlow.updateInformationFlow(project.getName(), statement, lattice);
-			} catch (IFbCException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-		
->>>>>>>> master:de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/StatementPattern.java.orig
-=======
-		statement.setTested(false);
-		TestStatement.setPathTested(statement, false);
-		DiagramPartsExtractor extractor = new DiagramPartsExtractor(getDiagram());
-		JavaVariables vars = extractor.getVars();
-		UpdateModifiableOfConditions.setVars(vars);
-		FileUtil.setApplicationUri(getDiagram().eResource().getURI());
-		UpdateModifiableOfConditions.updateAssignmentStatement(statement, new FileUtil(getDiagram().eResource().getURI().toPlatformString(true)));
->>>>>>> master
-		updatePictogramElement(context.getPictogramElement());
-	}
-
-	@Override
-	public void delete(IDeleteContext context) {
-		Shape shape = (Shape) context.getPictogramElement();
-		ContainerShape container = shape.getContainer();
-<<<<<<< HEAD
-<<<<<<<< HEAD:de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/OriginalStatementPattern.java
-		OriginalStatement statement = (OriginalStatement) getBusinessObjectForPictogramElement(
-========
-		AbstractStatement statement = (AbstractStatement) getBusinessObjectForPictogramElement(
->>>>>>>> master:de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/StatementPattern.java.orig
-=======
-		OriginalStatement statement = (OriginalStatement) getBusinessObjectForPictogramElement(
->>>>>>> master
-				context.getPictogramElement());
-		if (statement != null && statement.eContainer() != null
-				&& statement.eContainer() instanceof SelectionStatement) {
-			int indexToDelete = getIndex(shape.getGraphicsAlgorithm());
-			SelectionStatement selectionStatement = (SelectionStatement) statement.eContainer();
-			int indexInSelSt = selectionStatement.getCommands().indexOf(statement);
-			selectionStatement.getGuards().remove(indexInSelSt);
-			super.delete(context);
-			List<Shape> shapesToDelete = new ArrayList<Shape>();
-			for (Shape childShape : container.getChildren()) {
-				if (getIndex(childShape.getGraphicsAlgorithm()) == indexToDelete) {
-					shapesToDelete.add(childShape);
-				}
-			}
-			for (Shape deleteShape : shapesToDelete) {
-				EcoreUtil.delete(deleteShape, true);
-			}
-
-			for (Shape childShape : container.getChildren()) {
-				if (getIndex(childShape.getGraphicsAlgorithm()) > indexToDelete) {
-					setIndex(childShape.getGraphicsAlgorithm(), getIndex(childShape.getGraphicsAlgorithm()) - 1);
-				}
-			}
-			layoutPictogramElement(container);
-		} else {
-			super.delete(context);
-		}
-	}
-<<<<<<< HEAD
-<<<<<<<< HEAD:de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/OriginalStatementPattern.java
-}
-========
-}
->>>>>>>> master:de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/StatementPattern.java.orig
-=======
-}
->>>>>>> master
diff --git a/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/RenamingPattern.java.orig b/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/RenamingPattern.java.orig
deleted file mode 100644
index 382df53ba..000000000
--- a/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/RenamingPattern.java.orig
+++ /dev/null
@@ -1,318 +0,0 @@
-package de.tu_bs.cs.isf.cbc.tool.patterns;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.graphiti.features.IReason;
-import org.eclipse.graphiti.features.context.IAddContext;
-import org.eclipse.graphiti.features.context.ICreateContext;
-import org.eclipse.graphiti.features.impl.Reason;
-import org.eclipse.graphiti.mm.algorithms.GraphicsAlgorithm;
-import org.eclipse.graphiti.mm.algorithms.Polyline;
-import org.eclipse.graphiti.mm.algorithms.RoundedRectangle;
-import org.eclipse.graphiti.mm.algorithms.Text;
-import org.eclipse.graphiti.mm.algorithms.styles.Font;
-import org.eclipse.graphiti.mm.algorithms.styles.Orientation;
-import org.eclipse.graphiti.mm.algorithms.styles.Point;
-import org.eclipse.graphiti.mm.pictograms.ContainerShape;
-import org.eclipse.graphiti.mm.pictograms.Diagram;
-import org.eclipse.graphiti.mm.pictograms.PictogramElement;
-import org.eclipse.graphiti.mm.pictograms.Shape;
-import org.eclipse.graphiti.pattern.IPattern;
-import org.eclipse.graphiti.pattern.id.IdLayoutContext;
-import org.eclipse.graphiti.pattern.id.IdPattern;
-import org.eclipse.graphiti.pattern.id.IdUpdateContext;
-import org.eclipse.graphiti.services.Graphiti;
-import org.eclipse.graphiti.services.IGaService;
-import org.eclipse.graphiti.services.IPeCreateService;
-import org.eclipse.graphiti.util.PredefinedColoredAreas;
-
-import de.tu_bs.cs.isf.cbc.cbcmodel.CbcmodelFactory;
-import de.tu_bs.cs.isf.cbc.cbcmodel.Rename;
-import de.tu_bs.cs.isf.cbc.cbcmodel.Renaming;
-<<<<<<< HEAD
-import de.tu_bs.cs.isf.cbc.tool.model.CbcModelUtil;
-=======
-import de.tu_bs.cs.isf.cbc.util.CbcModelUtil;
->>>>>>> master
-
-/**
- * Class that creates the graphical representation for renaming
- * @author Tobias
- *
- */
-public class RenamingPattern extends IdPattern implements IPattern {
-
-	private static final String ID_NAME_TEXT = "RenamingName";
-	private static final String ID_RENAME_FUNCTION = "functionName";
-	private static final String ID_RENAME_TYPE = "functionType";
-	private static final String ID_RENAME_NEW = "newFunctionName";
-	private static final String ID_MAIN_RECTANGLE = "mainRectangle";
-	//Header:
-	private static final String ID_TYPE_HEADER = "typeHeader";
-	private static final String ID_DESTINATION_HEADER = "destinationHeader";
-	private static final String ID_RENAMED_HEADER = "renamedHeader"; //the name that is used in the diagram
-	//lines:
-	private static final String ID_HOR1_LINE = "hor1Header";
-	private static final String ID_HOR2_LINE = "hor2Header";
-	private static final String ID_VER1_LINE = "ver1Header";
-	private static final String ID_VER2_LINE = "ver2Header";
-
-	/**
-	 * Constructor of the class
-	 */
-	public RenamingPattern() {
-		super();
-	}
-	
-	@Override
-	public String getCreateName() {
-		return "Renaming";
-	}
-	
-	@Override
-	public String getCreateDescription() {
-		return "Create a list of function renaming.";
-	}
-
-	@Override
-	public boolean isMainBusinessObjectApplicable(Object mainBusinessObject) {
-		return mainBusinessObject instanceof Renaming;
-	}
-
-	@Override
-	public boolean canCreate(ICreateContext context) {
-		Renaming renaming = null;
-		for (Shape shape : getDiagram().getChildren()) {
-			Object obj = getBusinessObjectForPictogramElement(shape);
-			if (obj instanceof Renaming) {
-				renaming = (Renaming) obj;
-			}
-		}
-		if (renaming != null) return false;
-		return context.getTargetContainer() instanceof Diagram;
-	}
-	
-	@Override
-	public Object[] create(ICreateContext context) {
-		Renaming renaming = CbcmodelFactory.eINSTANCE.createRenaming();
-		Rename rename = CbcmodelFactory.eINSTANCE.createRename();
-		rename.setType("pred");
-		rename.setFunction("Example.example");
-		rename.setNewName("exp");
-		renaming.getRename().add(rename);
-		
-		try {
-			CbcModelUtil.saveRenamingToModelFile(renaming, getDiagram());
-		} catch (CoreException | IOException e) {
-			e.printStackTrace();
-		}
-		
-		addGraphicalRepresentation(context, renaming);
-		return new Object[] { renaming };
-	}
-
-	@Override
-	public boolean canAdd(IAddContext context) {
-		return super.canAdd(context) && context.getTargetContainer() instanceof Diagram;
-	}
-
-	@Override
-	public PictogramElement doAdd(IAddContext context) {
-		
-		Diagram targetDiagram = (Diagram) context.getTargetContainer();
-		Renaming addedRenaming = (Renaming) context.getNewObject();
-		IPeCreateService peCreateService = Graphiti.getPeCreateService();
-		IGaService gaService = Graphiti.getGaService();
-
-		int width = context.getWidth() <= 0 ? 400 : context.getWidth();
-        int height = context.getHeight() <= 0 ? 150 : context.getHeight();
-        
-        Font headerFont = gaService.manageFont(getDiagram(), "Arial", 9, false, true);
-        
-		// Main contents area
-		ContainerShape outerContainerShape = peCreateService.createContainerShape(targetDiagram, true);
-		RoundedRectangle mainRectangle = gaService.createRoundedRectangle(outerContainerShape, 20, 20);
-		mainRectangle.setFilled(true);
-		gaService.setRenderingStyle(mainRectangle, PredefinedColoredAreas.getBlueWhiteAdaptions());
-		setId(mainRectangle, ID_MAIN_RECTANGLE);
-		gaService.setLocationAndSize(mainRectangle,
-	            context.getX(), context.getY(), width, height);
-
-        // create link and wire it
-        link(outerContainerShape, addedRenaming);
-
-		Shape nameTextShape = peCreateService.createShape(outerContainerShape, false);
-		Text renamingNameText = gaService.createText(nameTextShape, "Renaming");
-		setId(renamingNameText, ID_NAME_TEXT);
-		renamingNameText.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		renamingNameText.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		renamingNameText.setFont(headerFont);
-		
-		//header:
-		Shape typeHeaderShape = peCreateService.createShape(outerContainerShape, false);
-		Text typeHeader = gaService.createText(typeHeaderShape, "data type");
-		setId(typeHeader, ID_TYPE_HEADER);
-		typeHeader.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		typeHeader.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);	
-		typeHeader.setFont(headerFont);
-		
-		Shape destinationHeaderShape = peCreateService.createShape(outerContainerShape, false);
-		Text destinationHeader = gaService.createText(destinationHeaderShape, "original name");
-		setId(destinationHeader, ID_DESTINATION_HEADER);
-		destinationHeader.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		destinationHeader.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);	
-		destinationHeader.setFont(headerFont);
-		
-		Shape remanedHeaderShape = peCreateService.createShape(outerContainerShape, false);
-		Text remanedHeader = gaService.createText(remanedHeaderShape, "renamed");
-		setId(remanedHeader, ID_RENAMED_HEADER);
-		remanedHeader.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		remanedHeader.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);	
-		remanedHeader.setFont(headerFont);
-		
-		//lines:	
-		Shape hor1Shape = peCreateService.createShape(outerContainerShape, false);
-		Polyline hor1line = gaService.createPolyline(hor1Shape);
-		setId(hor1line, ID_HOR1_LINE);
-		
-		Shape hor2Shape = peCreateService.createShape(outerContainerShape, false);
-		Polyline hor2line = gaService.createPolyline(hor2Shape);
-		setId(hor2line, ID_HOR2_LINE);
-		
-		Shape ver1Shape = peCreateService.createShape(outerContainerShape, false);
-		Polyline ver1line = Graphiti.getGaService().createPolyline(ver1Shape);
-		setId(ver1line, ID_VER1_LINE);
-		
-		Shape ver2Shape = peCreateService.createShape(outerContainerShape, false);
-		Polyline ver2line = Graphiti.getGaService().createPolyline(ver2Shape);
-		setId(ver2line, ID_VER2_LINE);
-		
-		link(outerContainerShape, addedRenaming);
-		link(nameTextShape, addedRenaming);
-
-		return outerContainerShape;
-	}
-
-	@Override
-	protected boolean layout(IdLayoutContext context, String id) {
-		boolean changesDone = false;
-		
-		GraphicsAlgorithm mainRectangle = context.getRootPictogramElement().getGraphicsAlgorithm();
-		Renaming renaming = (Renaming) getBusinessObjectForPictogramElement(context.getRootPictogramElement());
-		GraphicsAlgorithm ga = context.getGraphicsAlgorithm();
-		int height = mainRectangle.getHeight();
-		if (renaming.getRename().size() >= 1) {
-			height = height / (renaming.getRename().size() + 2);
-		}
-		int width = mainRectangle.getWidth() / 3;
-		
-		
-		if (id.equals(ID_NAME_TEXT)) {
-			Graphiti.getGaService().setLocationAndSize(ga, 0, 0, mainRectangle.getWidth(), height);
-			changesDone = true;
-		} else if (id.equals(ID_RENAME_FUNCTION)) {
-			int index = getIndex(context.getGraphicsAlgorithm());
-			Graphiti.getGaService().setLocationAndSize(ga, width, height * (index + 2), width, height);
-			changesDone = true;
-		} else if (id.equals(ID_RENAME_TYPE)) {
-			int index = getIndex(context.getGraphicsAlgorithm());
-			Graphiti.getGaService().setLocationAndSize(ga, 0, height * (index + 2), width, height);
-			changesDone = true;
-		} else if (id.equals(ID_RENAME_NEW)) {
-			int index = getIndex(context.getGraphicsAlgorithm());
-			Graphiti.getGaService().setLocationAndSize(ga, width * 2, height * (index + 2), width, height);
-			changesDone = true;
-		} else if (id.equals(ID_TYPE_HEADER)) {
-			Graphiti.getGaService().setLocationAndSize(ga, 0, height, width, height);
-			changesDone = true;
-		} else if (id.equals(ID_DESTINATION_HEADER)) {
-			Graphiti.getGaService().setLocationAndSize(ga, width, height, width, height);
-			changesDone = true;
-		} else if (id.equals(ID_RENAMED_HEADER)) {
-			Graphiti.getGaService().setLocationAndSize(ga, width * 2, height, width, height);
-			changesDone = true;
-		} else if (id.equals(ID_HOR1_LINE)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService().createPointList(
-					new int[] { 0, height, mainRectangle.getWidth(), height});
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		} else if (id.equals(ID_HOR2_LINE)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService().createPointList(
-					new int[] { 0, height * 2, mainRectangle.getWidth(), height * 2 });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;	
-		} else if (id.equals(ID_VER1_LINE)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService().createPointList(
-					new int[] { width, height, width, mainRectangle.getHeight() });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		} else if (id.equals(ID_VER2_LINE)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService().createPointList(
-					new int[] { width * 2, height, width * 2, mainRectangle.getHeight() });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		}
-
-		return changesDone;
-	}
-	
-	@Override
-	protected IReason updateNeeded(IdUpdateContext context, String id) {
-		if (id.equals(ID_MAIN_RECTANGLE)) {
-			ContainerShape containerShape = (ContainerShape) context.getPictogramElement();
-			Renaming renaming = (Renaming) context.getDomainObject();
-			if (containerShape.getChildren().size() - 8 != renaming.getRename().size() * 3) {
-				return Reason.createTrueReason("Number of function renaming differ. Expected: " + renaming.getRename().size() 
-						+ " " + (containerShape.getChildren().size() - 8));
-			}
-		}
-		return Reason.createFalseReason();
-	}
-
-	@Override
-	protected boolean update(IdUpdateContext context, String id) {
-		if (id.equals(ID_MAIN_RECTANGLE)) {
-			EList<Rename> renames = ((Renaming) context.getDomainObject()).getRename();
-			while ((((ContainerShape) context.getPictogramElement()).getChildren().size() - 8) / 3 < renames.size()) {
-				int newIndex = (((ContainerShape) context.getPictogramElement()).getChildren().size() - 8) / 3;
-				Rename rename = renames.get(newIndex);
-				Shape shapeFunctionText = Graphiti.getPeCreateService().createShape((ContainerShape) context.getPictogramElement(), true);
-				Text functionNameText = Graphiti.getGaService().createText(shapeFunctionText, rename.getFunction());
-				setId(functionNameText, ID_RENAME_FUNCTION);
-				setIndex(functionNameText, newIndex);
-				functionNameText.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-				functionNameText.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-				link(shapeFunctionText, rename);
-				
-				Shape shapeTypeText = Graphiti.getPeCreateService().createShape((ContainerShape) context.getPictogramElement(), true);
-				Text functionTypeText = Graphiti.getGaService().createText(shapeTypeText, rename.getType());
-				setId(functionTypeText, ID_RENAME_TYPE);
-				setIndex(functionTypeText, newIndex);
-				functionTypeText.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-				functionTypeText.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-				link(shapeTypeText, rename);
-				
-				Shape shapeNewNameText = Graphiti.getPeCreateService().createShape((ContainerShape) context.getPictogramElement(), true);
-				Text functionNewNameText = Graphiti.getGaService().createText(shapeNewNameText, rename.getNewName());
-				setId(functionNewNameText, ID_RENAME_NEW);
-				setIndex(functionNewNameText, newIndex);
-				functionNewNameText.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-				functionNewNameText.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-				link(shapeNewNameText, rename);				
-			}
-			return true;
-		}
-		return false;
-	}
-}
\ No newline at end of file
diff --git a/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/ReturnPattern.java.orig b/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/ReturnPattern.java.orig
deleted file mode 100644
index cb9874677..000000000
--- a/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/ReturnPattern.java.orig
+++ /dev/null
@@ -1,628 +0,0 @@
-package de.tu_bs.cs.isf.cbc.tool.patterns;
-
-import java.util.List;
-
-<<<<<<< HEAD
-=======
-import org.eclipse.core.resources.IProject;
->>>>>>> master
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.graphiti.features.IReason;
-import org.eclipse.graphiti.features.context.IAddContext;
-import org.eclipse.graphiti.features.context.ICreateContext;
-import org.eclipse.graphiti.features.context.IDirectEditingContext;
-import org.eclipse.graphiti.features.impl.Reason;
-import org.eclipse.graphiti.mm.algorithms.GraphicsAlgorithm;
-import org.eclipse.graphiti.mm.algorithms.Image;
-import org.eclipse.graphiti.mm.algorithms.MultiText;
-import org.eclipse.graphiti.mm.algorithms.Polyline;
-import org.eclipse.graphiti.mm.algorithms.RoundedRectangle;
-import org.eclipse.graphiti.mm.algorithms.Text;
-import org.eclipse.graphiti.mm.algorithms.styles.Font;
-import org.eclipse.graphiti.mm.algorithms.styles.Orientation;
-import org.eclipse.graphiti.mm.algorithms.styles.Point;
-import org.eclipse.graphiti.mm.pictograms.ContainerShape;
-import org.eclipse.graphiti.mm.pictograms.Diagram;
-import org.eclipse.graphiti.mm.pictograms.PictogramElement;
-import org.eclipse.graphiti.mm.pictograms.Shape;
-import org.eclipse.graphiti.pattern.IPattern;
-import org.eclipse.graphiti.pattern.id.IdLayoutContext;
-import org.eclipse.graphiti.pattern.id.IdPattern;
-import org.eclipse.graphiti.pattern.id.IdUpdateContext;
-import org.eclipse.graphiti.services.Graphiti;
-import org.eclipse.graphiti.services.IGaService;
-import org.eclipse.graphiti.services.IPeCreateService;
-import org.eclipse.graphiti.services.IPeService;
-import org.eclipse.graphiti.util.IColorConstant;
-import org.eclipse.graphiti.util.PredefinedColoredAreas;
-
-import de.tu_bs.cs.isf.cbc.cbcmodel.AbstractStatement;
-import de.tu_bs.cs.isf.cbc.cbcmodel.CbcmodelFactory;
-import de.tu_bs.cs.isf.cbc.cbcmodel.Condition;
-import de.tu_bs.cs.isf.cbc.cbcmodel.JavaVariables;
-import de.tu_bs.cs.isf.cbc.cbcmodel.ReturnStatement;
-<<<<<<< HEAD
-import de.tu_bs.cs.isf.cbc.tool.diagram.CbCImageProvider;
-import de.tu_bs.cs.isf.cbc.tool.helper.HighlightHelper;
-import de.tu_bs.cs.isf.cbc.tool.helper.UpdateModifiableOfConditions;
-import de.tu_bs.cs.isf.cbc.util.CompareMethodBodies;
-import de.tu_bs.cs.isf.cbc.util.FileUtil;
-=======
-import de.tu_bs.cs.isf.cbc.parser.exceptions.IFbCException;
-import de.tu_bs.cs.isf.cbc.tool.diagram.CbCImageProvider;
-import de.tu_bs.cs.isf.cbc.tool.features.TestStatement;
-import de.tu_bs.cs.isf.cbc.tool.helper.GetProjectUtil;
-import de.tu_bs.cs.isf.cbc.tool.helper.HighlightHelper;
-import de.tu_bs.cs.isf.cbc.tool.helper.UpdateInformationFlow;
-import de.tu_bs.cs.isf.cbc.tool.helper.UpdateModifiableOfConditions;
-import de.tu_bs.cs.isf.cbc.util.CompareMethodBodies;
-import de.tu_bs.cs.isf.cbc.util.DiagramPartsExtractor;
-import de.tu_bs.cs.isf.cbc.util.FileUtil;
-import de.tu_bs.cs.isf.lattice.Lattice;
-import de.tu_bs.cs.isf.lattice.Lattices;
->>>>>>> master
-
-
-/**
- * Class that creates the graphical representation of Conditions
- * @author Tobias
- *
- */
-public class ReturnPattern extends IdPattern implements IPattern {
-
-
-	private static final String ID_NAME_TEXT = "statementText";
-	private static final String ID_PRE_TEXT = "preText";
-<<<<<<< HEAD
-	private static final String ID_POST_TEXT = "postText";
-=======
-	private static final String ID_PRE_MOD = "preConditionModifiables";
-	private static final String ID_POST_TEXT = "postText";
-	private static final String ID_POST_MOD = "postConditionModifiables";
->>>>>>> master
-	private static final String ID_MAIN_RECTANGLE = "mainRectangle";
-	private static final String ID_IMAGE_PROVEN = "imageproven";
-	//Headers:
-	private static final String ID_PRE_HEADER = "preHeader";
-	private static final String ID_POST_HEADER = "postHeader";
-	private static final String ID_NAME_HEADER = "statementHeader";
-<<<<<<< HEAD
-=======
-	private static final String ID_NAME_HEADER2 = "statementHeader2";
->>>>>>> master
-	//Separating lines:
-	private static final String ID_HEADER_SEPARATER = "headerSeparater";
-	private static final String ID_POST_SEP = "postSep";
-	private static final String ID_PRE_SEP = "preSep";
-<<<<<<< HEAD
-=======
-	private static final String ID_HOR1_LINE = "hor1Line";
-	private static final String ID_HOR2_LINE = "hor2Line";
->>>>>>> master
-
-	/**
-	 * Constructor of the class
-	 */
-	public ReturnPattern() {
-		super();
-	}
-	
-	@Override
-	public String getCreateName() {
-		return "ReturnStatement";
-	}
-	
-	@Override
-	public String getCreateDescription() {
-		return "Create a ReturnStatement.";
-	}
-
-	@Override
-	public boolean isMainBusinessObjectApplicable(Object mainBusinessObject) {
-		return mainBusinessObject instanceof ReturnStatement;
-	}
-
-	@Override
-	public boolean canCreate(ICreateContext context) {
-		return context.getTargetContainer() instanceof Diagram;
-	}
-	
-	@Override
-	public Object[] create(ICreateContext context) {
-		ReturnStatement statement = CbcmodelFactory.eINSTANCE.createReturnStatement();
-		statement.setName("Statement");
-		Condition pre = CbcmodelFactory.eINSTANCE.createCondition();
-		pre.setName("");
-		statement.setPreCondition(pre);
-		Condition post = CbcmodelFactory.eINSTANCE.createCondition();
-		post.setName("");
-		statement.setPostCondition(post);
-		
-		statement.setComment("returnStatement");
-		
-		addGraphicalRepresentation(context, statement);
-		return new Object[] { statement };
-	}
-
-	@Override
-	public boolean canAdd(IAddContext context) {
-		return super.canAdd(context) && context.getTargetContainer() instanceof Diagram;
-	}
-
-	@Override
-	public PictogramElement doAdd(IAddContext context) {
-		manageColor(IColorConstant.DARK_GREEN);
-<<<<<<< HEAD
-=======
-		manageColor(IColorConstant.LIGHT_ORANGE);
->>>>>>> master
-		
-		Diagram targetDiagram = (Diagram) context.getTargetContainer();
-		ReturnStatement addedStatement = (ReturnStatement) context.getNewObject();
-		IPeCreateService peCreateService = Graphiti.getPeCreateService();
-		IGaService gaService = Graphiti.getGaService();
-
-<<<<<<< HEAD
-		int width = context.getWidth() <= 0 ? 300 : context.getWidth();
-        int height = context.getHeight() <= 0 ? 100 : context.getHeight();
-=======
-		int width = context.getWidth() <= 0 ? 350 : context.getWidth();
-        int height = context.getHeight() <= 0 ? 150 : context.getHeight();
->>>>>>> master
-        //Font:
-        Font headerFont = gaService.manageFont(getDiagram(), "Arial", 9, false, true);
-        
-		// Main contents area
-		ContainerShape outerContainerShape = peCreateService.createContainerShape(targetDiagram, true);
-		RoundedRectangle mainRectangle = gaService.createRoundedRectangle(outerContainerShape, 20, 20);
-		mainRectangle.setFilled(true);
-		gaService.setRenderingStyle(mainRectangle, PredefinedColoredAreas.getBlueWhiteAdaptions());
-		mainRectangle.setForeground(manageColor(IColorConstant.RED));
-		mainRectangle.setLineWidth(2);
-		setId(mainRectangle, ID_MAIN_RECTANGLE);
-		gaService.setLocationAndSize(mainRectangle,
-	            context.getX(), context.getY(), width, height);
-
-        // create link and wire it
-        link(outerContainerShape, addedStatement);
-
-		// Statement name
-		Shape textShape = peCreateService.createShape(outerContainerShape, true);
-		MultiText statementNameText = gaService.createMultiText(textShape, "");
-		setId(statementNameText, ID_NAME_TEXT);
-		statementNameText.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		statementNameText.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		
-		Shape preShape = peCreateService.createShape(outerContainerShape, false);
-<<<<<<< HEAD
-		MultiText preNameText = gaService.createMultiText(preShape, "{" + addedStatement.getPreCondition().getName()+ "}");
-=======
-		MultiText preNameText = gaService.createMultiText(preShape,
-				"{" + addedStatement.getPreCondition().getName() + "}");
->>>>>>> master
-		setId(preNameText, ID_PRE_TEXT);
-		preNameText.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		preNameText.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		
-<<<<<<< HEAD
-		Shape postShape = peCreateService.createShape(outerContainerShape, false);
-		MultiText postNameText = gaService.createMultiText(postShape, "{" + addedStatement.getPostCondition().getName() + "}");
-		setId(postNameText, ID_POST_TEXT);
-		postNameText.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		postNameText.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-=======
-		Shape textShapePreConditionMod = peCreateService.createShape(outerContainerShape, true);
-		MultiText preConditionTextMod = gaService.createMultiText(textShapePreConditionMod, "");
-		setId(preConditionTextMod, ID_PRE_MOD);
-		String modString = "";
-		for (String s : addedStatement.getPreCondition().getModifiables()) {
-			modString += s + ", ";
-		}
-		preConditionTextMod.setValue("modifiable(" + (modString.equals("") ? "" : modString.substring(0, modString.length() - 2)) + ");");
-		preConditionTextMod.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		preConditionTextMod.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-
-		Shape postShape = peCreateService.createShape(outerContainerShape, false);
-		MultiText postNameText = gaService.createMultiText(postShape,
-				"{" + addedStatement.getPostCondition().getName() + "}");
-		setId(postNameText, ID_POST_TEXT);
-		postNameText.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		postNameText.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		
-		Shape textShapePostConditionMod = peCreateService.createShape(outerContainerShape, true);
-		MultiText postConditionTextMod = gaService.createMultiText(textShapePostConditionMod, "");
-		setId(postConditionTextMod, ID_POST_MOD);
-		modString = "";
-		for (String s : addedStatement.getPostCondition().getModifiables()) {
-			modString += s + ", ";
-		}
-		postConditionTextMod.setValue("modifiable(" + (modString.equals("") ? "" : modString.substring(0, modString.length() - 2)) + ");");
-		postConditionTextMod.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		postConditionTextMod.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
->>>>>>> master
-
-		Shape proveShape = peCreateService.createShape(outerContainerShape, false);
-		Image image = gaService.createImage(proveShape, CbCImageProvider.IMG_UNPROVEN);
-		setId(image, ID_IMAGE_PROVEN);
-		
-		//Header:---------------
-		Shape textHeader = peCreateService.createShape(outerContainerShape, false);
-<<<<<<< HEAD
-		Text statementNameHeader = gaService.createText(textHeader, "ReturnStatement");
-=======
-		Text statementNameHeader = gaService.createText(textHeader, "Return");
->>>>>>> master
-		setId(statementNameHeader, ID_NAME_HEADER);
-		statementNameHeader.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		statementNameHeader.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		statementNameHeader.setFont(headerFont);
-<<<<<<< HEAD
-=======
-
-		// Header:---------------
-		Shape textHeader2 = peCreateService.createShape(outerContainerShape, false);
-		Text statementNameHeader2 = gaService.createText(textHeader2, "Statement");
-		setId(statementNameHeader2, ID_NAME_HEADER2);
-		statementNameHeader2.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		statementNameHeader2.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		statementNameHeader2.setFont(headerFont);
->>>>>>> master
-		
-		Shape preHeader = peCreateService.createShape(outerContainerShape, false);
-		Text preNameHeader = gaService.createText(preHeader, "precondition");
-		setId(preNameHeader, ID_PRE_HEADER);
-		preNameHeader.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		preNameHeader.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		preNameHeader.setFont(headerFont);
-		
-		Shape postHeader = peCreateService.createShape(outerContainerShape, false);
-		Text postNameHeader = gaService.createText(postHeader, "postcondition");
-		setId(postNameHeader, ID_POST_HEADER);
-		postNameHeader.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		postNameHeader.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		postNameHeader.setFont(headerFont);
-		
-		//Separator:
-		Shape headerSepShape = peCreateService.createShape(outerContainerShape, false);
-		Polyline headerPolyline = gaService.createPolyline(headerSepShape);
-		setId(headerPolyline, ID_HEADER_SEPARATER);
-		
-		Shape preSepShape = peCreateService.createShape(outerContainerShape, false);
-		Polyline prePolyline = gaService.createPolyline(preSepShape);
-		setId(prePolyline, ID_PRE_SEP);
-		
-		Shape postSepShape = peCreateService.createShape(outerContainerShape, false);
-		Polyline postPolyline = gaService.createPolyline(postSepShape);
-		setId(postPolyline, ID_POST_SEP);
-		
-<<<<<<< HEAD
-=======
-		Shape hor1LineShape = peCreateService.createShape(outerContainerShape, false);
-		Polyline hor1Polyline = gaService.createPolyline(hor1LineShape);
-		setId(hor1Polyline, ID_HOR1_LINE);
-
-		Shape hor2LineShape = peCreateService.createShape(outerContainerShape, false);
-		Polyline hor2Polyline = gaService.createPolyline(hor2LineShape);
-		setId(hor2Polyline, ID_HOR2_LINE);
-		
->>>>>>> master
-		peCreateService.createChopboxAnchor(outerContainerShape);
-		peCreateService.createChopboxAnchor(textShape);
-
-		link(outerContainerShape, addedStatement);
-		link(textShape, addedStatement);
-		link(preShape, addedStatement.getPreCondition());
-<<<<<<< HEAD
-		link(postShape, addedStatement.getPostCondition());
-=======
-		link(textShapePreConditionMod, addedStatement.getPreCondition());
-		link(postShape, addedStatement.getPostCondition());
-		link(textShapePostConditionMod, addedStatement.getPostCondition());
->>>>>>> master
-		link(proveShape, addedStatement);
-
-		return outerContainerShape;
-	}
-
-	@Override
-	protected boolean layout(IdLayoutContext context, String id) {
-		boolean changesDone = false;
-		
-		GraphicsAlgorithm mainRectangle = context.getRootPictogramElement().getGraphicsAlgorithm();
-		GraphicsAlgorithm ga = context.getGraphicsAlgorithm();
-		int third = mainRectangle.getWidth() / 3;
-<<<<<<< HEAD
-=======
-		int thirdBlockHeight = (mainRectangle.getHeight() - 40)/3;
->>>>>>> master
-		
-		if (id.equals(ID_NAME_TEXT)) {
-			Graphiti.getGaService().setLocationAndSize(ga, third, 40, third, mainRectangle.getHeight() - 40);
-			changesDone = true;
-		} else if (id.equals(ID_PRE_TEXT)) {
-<<<<<<< HEAD
-			Graphiti.getGaService().setLocationAndSize(ga, 0, 40, third, mainRectangle.getHeight() - 40);
-			changesDone = true;
-		} else if (id.equals(ID_POST_TEXT)) {
-			Graphiti.getGaService().setLocationAndSize(ga, third * 2, 40, third, mainRectangle.getHeight() - 40); 
-=======
-			Graphiti.getGaService().setLocationAndSize(ga, 0, thirdBlockHeight+40, third, 2*thirdBlockHeight);
-			changesDone = true;
-		} else if (id.equals(ID_PRE_MOD)) {
-			Graphiti.getGaService().setLocationAndSize(ga, 0, 40, third, thirdBlockHeight);
-			changesDone = true;
-		} else if (id.equals(ID_POST_TEXT)) {
-			Graphiti.getGaService().setLocationAndSize(ga, third * 2, thirdBlockHeight+40, third, 2*thirdBlockHeight);
-			changesDone = true;
-		} else if (id.equals(ID_POST_MOD)) {
-			Graphiti.getGaService().setLocationAndSize(ga, third * 2, 40, third, thirdBlockHeight);
->>>>>>> master
-			changesDone = true;
-		} else if (id.equals(ID_IMAGE_PROVEN)) {
-			Graphiti.getGaService().setLocationAndSize(ga, mainRectangle.getWidth() - 20, 10, 10, 10);
-			changesDone = true;
-		//Header:
-		} else if (id.equals(ID_NAME_HEADER)) {
-<<<<<<< HEAD
-			Graphiti.getGaService().setLocationAndSize(ga, third, 20, third, 20); //mainrectangle anpassen
-=======
-			Graphiti.getGaService().setLocationAndSize(ga, third, 5, third, 20); // mainrectangle anpassen
-			changesDone = true;
-		} else if (id.equals(ID_NAME_HEADER2)) {
-			Graphiti.getGaService().setLocationAndSize(ga, third, 20, third, 20); // mainrectangle anpassen
->>>>>>> master
-			changesDone = true;
-		} else if (id.equals(ID_PRE_HEADER)) {
-			Graphiti.getGaService().setLocationAndSize(ga, 0, 20, third, 20); 
-			changesDone = true;
-		} else if (id.equals(ID_POST_HEADER)) {
-			Graphiti.getGaService().setLocationAndSize(ga, third * 2, 20, third, 20); 
-			changesDone = true;
-		//LINES:
-		} else if (id.equals(ID_HEADER_SEPARATER)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService().createPointList(
-					new int[] { 0, 40, mainRectangle.getWidth(), 40 });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-<<<<<<< HEAD
-		} else if (id.equals(ID_POST_SEP)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService().createPointList(
-					new int[] { third, 0, third, mainRectangle.getHeight() });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		} else if (id.equals(ID_PRE_SEP)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService().createPointList(
-					new int[] { third * 2, 0, third * 2, mainRectangle.getHeight() });
-=======
-		} else if (id.equals(ID_PRE_SEP)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService()
-					.createPointList(new int[] { third * 2, 0, third * 2, mainRectangle.getHeight() });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		} else if (id.equals(ID_HOR1_LINE)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService()
-					.createPointList(new int[] { 0, thirdBlockHeight+40, third, thirdBlockHeight+40 });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		} else if (id.equals(ID_POST_SEP)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService()
-					.createPointList(new int[] { third, 0, third, mainRectangle.getHeight() });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		} else if (id.equals(ID_HOR2_LINE)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService()
-					.createPointList(new int[] { 2*third, thirdBlockHeight+40, mainRectangle.getWidth(), thirdBlockHeight+40 });
->>>>>>> master
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		}
-
-		return changesDone;
-	}
-	
-	@Override
-	protected IReason updateNeeded(IdUpdateContext context, String id) {
-		if(context.getGraphicsAlgorithm() instanceof MultiText && context.getDomainObject() instanceof ReturnStatement) {
-			MultiText nameText = (MultiText) context.getGraphicsAlgorithm();
-			ReturnStatement domainObject = (ReturnStatement) context.getDomainObject();
-			if (domainObject.getName() == null || !domainObject.getName().equals(nameText.getValue())) {
-				return Reason.createTrueReason("Name differs. Expected: '" + domainObject.getName() + "'");
-			}
-		} 
-		else if (id.equals(ID_MAIN_RECTANGLE)) {
-			RoundedRectangle rectangle = (RoundedRectangle) context.getGraphicsAlgorithm();
-			AbstractStatement domainObject = (AbstractStatement) context.getDomainObject();
-			if (domainObject.isProven() && 
-					((rectangle.getForeground() != null && !rectangle.getForeground().equals(manageColor(IColorConstant.DARK_GREEN))) 
-							|| rectangle.getForeground() == null)) {
-				return Reason.createTrueReason("Statement is proven. Expected green color.");
-<<<<<<< HEAD
-			} else if (!domainObject.isProven() && 
-					((rectangle.getForeground() != null && rectangle.getForeground().equals(manageColor(IColorConstant.DARK_GREEN))) 
-=======
-			} else if (!domainObject.isProven() && domainObject.isTested() && 
-					((rectangle.getForeground() != null && !rectangle.getForeground().equals(manageColor(IColorConstant.LIGHT_ORANGE))) 
-							|| rectangle.getForeground() == null)) {
-				return Reason.createTrueReason("Statement is tested. Expected orange color.");
-			} else if (!domainObject.isProven() && !domainObject.isTested() &&
-					((rectangle.getForeground() != null && (rectangle.getForeground().equals(manageColor(IColorConstant.DARK_GREEN)) || rectangle.getForeground().equals(manageColor(IColorConstant.LIGHT_ORANGE)))) 
->>>>>>> master
-							|| rectangle.getForeground() == null)) {
-				return Reason.createTrueReason("Statement is not proven. Expected red color.");
-			} 
-		} else if (id.equals(ID_IMAGE_PROVEN)) {
-			AbstractStatement domainObject = (AbstractStatement) context.getDomainObject();
-			 Image image = (Image) context.getGraphicsAlgorithm();
-			if (domainObject.isProven() && image.getId().equals(CbCImageProvider.IMG_UNPROVEN)) {
-				return Reason.createTrueReason("Statement is proven. Expected green color.");
-			} else if (!domainObject.isProven() && image.getId().equals(CbCImageProvider.IMG_PROVEN)) {
-				return Reason.createTrueReason("Statement is not proven. Expected red color.");
-			} 
-		}
-		
-		if(HighlightHelper.instance.needsInitialHighlightUpdate(context)) {
-			return Reason.createTrueReason("Element needs to be highlighted.");
-		}
-		return Reason.createFalseReason();
-	}
-
-	@Override
-	protected boolean update(IdUpdateContext context, String id) {
-		if(context.getGraphicsAlgorithm() instanceof MultiText && context.getDomainObject() instanceof AbstractStatement) {
-			MultiText nameText = (MultiText) context.getGraphicsAlgorithm();
-			AbstractStatement domainObject = (AbstractStatement) context.getDomainObject();
-			nameText.setValue(domainObject.getName());
-			return true;
-		} 
-		else if (id.equals(ID_MAIN_RECTANGLE)) {
-			RoundedRectangle rectangle = (RoundedRectangle) context.getGraphicsAlgorithm();
-			AbstractStatement domainObject = (AbstractStatement) context.getDomainObject();
-			if (domainObject.isProven()) {
-				rectangle.setForeground(manageColor(IColorConstant.DARK_GREEN));
-				if(domainObject.getParent()!= null) {
-					IPeService pe = Graphiti.getPeService();
-					EObject[] objArray = {domainObject.getParent()};
-					Object[] obj =  pe.getLinkedPictogramElements(objArray, getDiagram());
-					Shape pElement = (Shape) obj[0];
-					if (pElement.getContainer() != null) updatePictogramElement(pElement.getContainer());
-				}
-<<<<<<< HEAD
-=======
-			} else if (domainObject.isTested()) {
-				rectangle.setForeground(manageColor(IColorConstant.LIGHT_ORANGE));
-				if(domainObject.getParent()!= null) {
-					IPeService pe = Graphiti.getPeService();
-					EObject[] objArray = {domainObject.getParent()};
-					Object[] obj =  pe.getLinkedPictogramElements(objArray, getDiagram());
-					Shape pElement = (Shape) obj[0];
-					if (pElement.getContainer() != null) updatePictogramElement(pElement.getContainer());
-				}		
->>>>>>> master
-			} else {
-				rectangle.setForeground(manageColor(IColorConstant.RED));
-				if(domainObject.getParent()!= null) {
-					IPeService pe = Graphiti.getPeService();
-					EObject[] objArray = {domainObject.getParent()};
-					Object[] obj =  pe.getLinkedPictogramElements(objArray, getDiagram());
-					if (obj.length > 0) {
-						Shape pElement = (Shape) obj[0];
-						if (pElement.getContainer() != null) updatePictogramElement(pElement.getContainer());
-					}
-				}
-			}
-			
-			HighlightHelper.instance.handleHighlightDrawing(context, rectangle);
-			updateParent(domainObject);
-			return true;
-		} else if (id.equals(ID_IMAGE_PROVEN)) {
-			AbstractStatement domainObject = (AbstractStatement) context.getDomainObject();
-			 Image image = (Image) context.getGraphicsAlgorithm();
-			if (domainObject.isProven()) {
-				image.setId(CbCImageProvider.IMG_PROVEN);
-			} else {
-				image.setId(CbCImageProvider.IMG_UNPROVEN);
-			} 
-		}
-		return false;
-	}
-	
-	private void updateParent(AbstractStatement statement) {
-		if (statement.getParent() != null) {
-			IPeService pe = Graphiti.getPeService();
-			EObject[] objArray = { statement.getParent() };
-			Object[] obj = pe.getLinkedPictogramElements(objArray, getDiagram());
-			if (obj.length > 0) {
-				Shape pElement = (Shape) obj[0];
-				if (pElement.getContainer() != null)
-					updatePictogramElement(pElement.getContainer());
-			}
-		}
-	}
-
-	@Override
-	public int getEditingType() {
-		return TYPE_MULTILINETEXT;
-	}
-
-	@Override
-	public boolean canDirectEdit(IDirectEditingContext context) {
-		Object domainObject = getBusinessObjectForPictogramElement(context.getPictogramElement());
-		GraphicsAlgorithm ga = context.getGraphicsAlgorithm();
-		if (domainObject instanceof AbstractStatement && ga instanceof MultiText) {
-			return true;
-		}
-		return false;
-	}
-
-	@Override
-	public String getInitialValue(IDirectEditingContext context) {
-		AbstractStatement statement = (AbstractStatement) getBusinessObjectForPictogramElement(context.getPictogramElement());
-		return statement.getName();
-	}
-
-	@Override
-	public String checkValueValid(String value, IDirectEditingContext context) {
-		if (value == null || value.length() == 0) {
-			return "Statement must not be empty";
-		}
-		if (value.contains(";") && !CompareMethodBodies.readAndTestMethodBodyWithJaMoPP2(value)) {
-			return "Statement has not the correct syntax.";
-		}
-		return null;
-	}
-
-	@Override
-	public void setValue(String value, IDirectEditingContext context) {
-		AbstractStatement statement = (AbstractStatement) getBusinessObjectForPictogramElement(context.getPictogramElement());
-		statement.setName(value);
-		statement.setProven(false);
-<<<<<<< HEAD
-		JavaVariables vars = null;
-		for (Shape shape : getDiagram().getChildren()) {
-			Object obj = getBusinessObjectForPictogramElement(shape); 
-			if (obj instanceof JavaVariables) {
-				vars = (JavaVariables) obj;
-			}
-		}
-		UpdateModifiableOfConditions.setVars(vars);
-		UpdateModifiableOfConditions.updateAssignmentStatement(statement, new FileUtil(getDiagram().eResource().getURI().toPlatformString(true)));
-=======
-		statement.setTested(false);
-		TestStatement.setPathTested(statement, false);
-		updateParent(statement);
-		DiagramPartsExtractor extractor = new DiagramPartsExtractor(getDiagram());
-		JavaVariables vars = extractor.getVars();
-		UpdateModifiableOfConditions.setVars(vars);
-		UpdateModifiableOfConditions.updateAssignmentStatement(statement, new FileUtil(getDiagram().eResource().getURI().toPlatformString(true)));
-		
-		//Start of IFbC
-		final IProject project = GetProjectUtil.getProjectForDiagram(getDiagram());
-		final Lattice lattice = Lattices.getLatticeForProject(project);
-		if (lattice != null) {
-			try {
-				UpdateInformationFlow.updateInformationFlow(project.getName(), statement, lattice);
-			} catch (IFbCException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-		
->>>>>>> master
-		updatePictogramElement(context.getPictogramElement());
-	}
-}
-
diff --git a/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/ReturnPattern.java.orig.orig b/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/ReturnPattern.java.orig.orig
deleted file mode 100644
index cb9874677..000000000
--- a/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/ReturnPattern.java.orig.orig
+++ /dev/null
@@ -1,628 +0,0 @@
-package de.tu_bs.cs.isf.cbc.tool.patterns;
-
-import java.util.List;
-
-<<<<<<< HEAD
-=======
-import org.eclipse.core.resources.IProject;
->>>>>>> master
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.graphiti.features.IReason;
-import org.eclipse.graphiti.features.context.IAddContext;
-import org.eclipse.graphiti.features.context.ICreateContext;
-import org.eclipse.graphiti.features.context.IDirectEditingContext;
-import org.eclipse.graphiti.features.impl.Reason;
-import org.eclipse.graphiti.mm.algorithms.GraphicsAlgorithm;
-import org.eclipse.graphiti.mm.algorithms.Image;
-import org.eclipse.graphiti.mm.algorithms.MultiText;
-import org.eclipse.graphiti.mm.algorithms.Polyline;
-import org.eclipse.graphiti.mm.algorithms.RoundedRectangle;
-import org.eclipse.graphiti.mm.algorithms.Text;
-import org.eclipse.graphiti.mm.algorithms.styles.Font;
-import org.eclipse.graphiti.mm.algorithms.styles.Orientation;
-import org.eclipse.graphiti.mm.algorithms.styles.Point;
-import org.eclipse.graphiti.mm.pictograms.ContainerShape;
-import org.eclipse.graphiti.mm.pictograms.Diagram;
-import org.eclipse.graphiti.mm.pictograms.PictogramElement;
-import org.eclipse.graphiti.mm.pictograms.Shape;
-import org.eclipse.graphiti.pattern.IPattern;
-import org.eclipse.graphiti.pattern.id.IdLayoutContext;
-import org.eclipse.graphiti.pattern.id.IdPattern;
-import org.eclipse.graphiti.pattern.id.IdUpdateContext;
-import org.eclipse.graphiti.services.Graphiti;
-import org.eclipse.graphiti.services.IGaService;
-import org.eclipse.graphiti.services.IPeCreateService;
-import org.eclipse.graphiti.services.IPeService;
-import org.eclipse.graphiti.util.IColorConstant;
-import org.eclipse.graphiti.util.PredefinedColoredAreas;
-
-import de.tu_bs.cs.isf.cbc.cbcmodel.AbstractStatement;
-import de.tu_bs.cs.isf.cbc.cbcmodel.CbcmodelFactory;
-import de.tu_bs.cs.isf.cbc.cbcmodel.Condition;
-import de.tu_bs.cs.isf.cbc.cbcmodel.JavaVariables;
-import de.tu_bs.cs.isf.cbc.cbcmodel.ReturnStatement;
-<<<<<<< HEAD
-import de.tu_bs.cs.isf.cbc.tool.diagram.CbCImageProvider;
-import de.tu_bs.cs.isf.cbc.tool.helper.HighlightHelper;
-import de.tu_bs.cs.isf.cbc.tool.helper.UpdateModifiableOfConditions;
-import de.tu_bs.cs.isf.cbc.util.CompareMethodBodies;
-import de.tu_bs.cs.isf.cbc.util.FileUtil;
-=======
-import de.tu_bs.cs.isf.cbc.parser.exceptions.IFbCException;
-import de.tu_bs.cs.isf.cbc.tool.diagram.CbCImageProvider;
-import de.tu_bs.cs.isf.cbc.tool.features.TestStatement;
-import de.tu_bs.cs.isf.cbc.tool.helper.GetProjectUtil;
-import de.tu_bs.cs.isf.cbc.tool.helper.HighlightHelper;
-import de.tu_bs.cs.isf.cbc.tool.helper.UpdateInformationFlow;
-import de.tu_bs.cs.isf.cbc.tool.helper.UpdateModifiableOfConditions;
-import de.tu_bs.cs.isf.cbc.util.CompareMethodBodies;
-import de.tu_bs.cs.isf.cbc.util.DiagramPartsExtractor;
-import de.tu_bs.cs.isf.cbc.util.FileUtil;
-import de.tu_bs.cs.isf.lattice.Lattice;
-import de.tu_bs.cs.isf.lattice.Lattices;
->>>>>>> master
-
-
-/**
- * Class that creates the graphical representation of Conditions
- * @author Tobias
- *
- */
-public class ReturnPattern extends IdPattern implements IPattern {
-
-
-	private static final String ID_NAME_TEXT = "statementText";
-	private static final String ID_PRE_TEXT = "preText";
-<<<<<<< HEAD
-	private static final String ID_POST_TEXT = "postText";
-=======
-	private static final String ID_PRE_MOD = "preConditionModifiables";
-	private static final String ID_POST_TEXT = "postText";
-	private static final String ID_POST_MOD = "postConditionModifiables";
->>>>>>> master
-	private static final String ID_MAIN_RECTANGLE = "mainRectangle";
-	private static final String ID_IMAGE_PROVEN = "imageproven";
-	//Headers:
-	private static final String ID_PRE_HEADER = "preHeader";
-	private static final String ID_POST_HEADER = "postHeader";
-	private static final String ID_NAME_HEADER = "statementHeader";
-<<<<<<< HEAD
-=======
-	private static final String ID_NAME_HEADER2 = "statementHeader2";
->>>>>>> master
-	//Separating lines:
-	private static final String ID_HEADER_SEPARATER = "headerSeparater";
-	private static final String ID_POST_SEP = "postSep";
-	private static final String ID_PRE_SEP = "preSep";
-<<<<<<< HEAD
-=======
-	private static final String ID_HOR1_LINE = "hor1Line";
-	private static final String ID_HOR2_LINE = "hor2Line";
->>>>>>> master
-
-	/**
-	 * Constructor of the class
-	 */
-	public ReturnPattern() {
-		super();
-	}
-	
-	@Override
-	public String getCreateName() {
-		return "ReturnStatement";
-	}
-	
-	@Override
-	public String getCreateDescription() {
-		return "Create a ReturnStatement.";
-	}
-
-	@Override
-	public boolean isMainBusinessObjectApplicable(Object mainBusinessObject) {
-		return mainBusinessObject instanceof ReturnStatement;
-	}
-
-	@Override
-	public boolean canCreate(ICreateContext context) {
-		return context.getTargetContainer() instanceof Diagram;
-	}
-	
-	@Override
-	public Object[] create(ICreateContext context) {
-		ReturnStatement statement = CbcmodelFactory.eINSTANCE.createReturnStatement();
-		statement.setName("Statement");
-		Condition pre = CbcmodelFactory.eINSTANCE.createCondition();
-		pre.setName("");
-		statement.setPreCondition(pre);
-		Condition post = CbcmodelFactory.eINSTANCE.createCondition();
-		post.setName("");
-		statement.setPostCondition(post);
-		
-		statement.setComment("returnStatement");
-		
-		addGraphicalRepresentation(context, statement);
-		return new Object[] { statement };
-	}
-
-	@Override
-	public boolean canAdd(IAddContext context) {
-		return super.canAdd(context) && context.getTargetContainer() instanceof Diagram;
-	}
-
-	@Override
-	public PictogramElement doAdd(IAddContext context) {
-		manageColor(IColorConstant.DARK_GREEN);
-<<<<<<< HEAD
-=======
-		manageColor(IColorConstant.LIGHT_ORANGE);
->>>>>>> master
-		
-		Diagram targetDiagram = (Diagram) context.getTargetContainer();
-		ReturnStatement addedStatement = (ReturnStatement) context.getNewObject();
-		IPeCreateService peCreateService = Graphiti.getPeCreateService();
-		IGaService gaService = Graphiti.getGaService();
-
-<<<<<<< HEAD
-		int width = context.getWidth() <= 0 ? 300 : context.getWidth();
-        int height = context.getHeight() <= 0 ? 100 : context.getHeight();
-=======
-		int width = context.getWidth() <= 0 ? 350 : context.getWidth();
-        int height = context.getHeight() <= 0 ? 150 : context.getHeight();
->>>>>>> master
-        //Font:
-        Font headerFont = gaService.manageFont(getDiagram(), "Arial", 9, false, true);
-        
-		// Main contents area
-		ContainerShape outerContainerShape = peCreateService.createContainerShape(targetDiagram, true);
-		RoundedRectangle mainRectangle = gaService.createRoundedRectangle(outerContainerShape, 20, 20);
-		mainRectangle.setFilled(true);
-		gaService.setRenderingStyle(mainRectangle, PredefinedColoredAreas.getBlueWhiteAdaptions());
-		mainRectangle.setForeground(manageColor(IColorConstant.RED));
-		mainRectangle.setLineWidth(2);
-		setId(mainRectangle, ID_MAIN_RECTANGLE);
-		gaService.setLocationAndSize(mainRectangle,
-	            context.getX(), context.getY(), width, height);
-
-        // create link and wire it
-        link(outerContainerShape, addedStatement);
-
-		// Statement name
-		Shape textShape = peCreateService.createShape(outerContainerShape, true);
-		MultiText statementNameText = gaService.createMultiText(textShape, "");
-		setId(statementNameText, ID_NAME_TEXT);
-		statementNameText.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		statementNameText.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		
-		Shape preShape = peCreateService.createShape(outerContainerShape, false);
-<<<<<<< HEAD
-		MultiText preNameText = gaService.createMultiText(preShape, "{" + addedStatement.getPreCondition().getName()+ "}");
-=======
-		MultiText preNameText = gaService.createMultiText(preShape,
-				"{" + addedStatement.getPreCondition().getName() + "}");
->>>>>>> master
-		setId(preNameText, ID_PRE_TEXT);
-		preNameText.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		preNameText.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		
-<<<<<<< HEAD
-		Shape postShape = peCreateService.createShape(outerContainerShape, false);
-		MultiText postNameText = gaService.createMultiText(postShape, "{" + addedStatement.getPostCondition().getName() + "}");
-		setId(postNameText, ID_POST_TEXT);
-		postNameText.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		postNameText.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-=======
-		Shape textShapePreConditionMod = peCreateService.createShape(outerContainerShape, true);
-		MultiText preConditionTextMod = gaService.createMultiText(textShapePreConditionMod, "");
-		setId(preConditionTextMod, ID_PRE_MOD);
-		String modString = "";
-		for (String s : addedStatement.getPreCondition().getModifiables()) {
-			modString += s + ", ";
-		}
-		preConditionTextMod.setValue("modifiable(" + (modString.equals("") ? "" : modString.substring(0, modString.length() - 2)) + ");");
-		preConditionTextMod.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		preConditionTextMod.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-
-		Shape postShape = peCreateService.createShape(outerContainerShape, false);
-		MultiText postNameText = gaService.createMultiText(postShape,
-				"{" + addedStatement.getPostCondition().getName() + "}");
-		setId(postNameText, ID_POST_TEXT);
-		postNameText.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		postNameText.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		
-		Shape textShapePostConditionMod = peCreateService.createShape(outerContainerShape, true);
-		MultiText postConditionTextMod = gaService.createMultiText(textShapePostConditionMod, "");
-		setId(postConditionTextMod, ID_POST_MOD);
-		modString = "";
-		for (String s : addedStatement.getPostCondition().getModifiables()) {
-			modString += s + ", ";
-		}
-		postConditionTextMod.setValue("modifiable(" + (modString.equals("") ? "" : modString.substring(0, modString.length() - 2)) + ");");
-		postConditionTextMod.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		postConditionTextMod.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
->>>>>>> master
-
-		Shape proveShape = peCreateService.createShape(outerContainerShape, false);
-		Image image = gaService.createImage(proveShape, CbCImageProvider.IMG_UNPROVEN);
-		setId(image, ID_IMAGE_PROVEN);
-		
-		//Header:---------------
-		Shape textHeader = peCreateService.createShape(outerContainerShape, false);
-<<<<<<< HEAD
-		Text statementNameHeader = gaService.createText(textHeader, "ReturnStatement");
-=======
-		Text statementNameHeader = gaService.createText(textHeader, "Return");
->>>>>>> master
-		setId(statementNameHeader, ID_NAME_HEADER);
-		statementNameHeader.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		statementNameHeader.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		statementNameHeader.setFont(headerFont);
-<<<<<<< HEAD
-=======
-
-		// Header:---------------
-		Shape textHeader2 = peCreateService.createShape(outerContainerShape, false);
-		Text statementNameHeader2 = gaService.createText(textHeader2, "Statement");
-		setId(statementNameHeader2, ID_NAME_HEADER2);
-		statementNameHeader2.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		statementNameHeader2.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		statementNameHeader2.setFont(headerFont);
->>>>>>> master
-		
-		Shape preHeader = peCreateService.createShape(outerContainerShape, false);
-		Text preNameHeader = gaService.createText(preHeader, "precondition");
-		setId(preNameHeader, ID_PRE_HEADER);
-		preNameHeader.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		preNameHeader.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		preNameHeader.setFont(headerFont);
-		
-		Shape postHeader = peCreateService.createShape(outerContainerShape, false);
-		Text postNameHeader = gaService.createText(postHeader, "postcondition");
-		setId(postNameHeader, ID_POST_HEADER);
-		postNameHeader.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		postNameHeader.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		postNameHeader.setFont(headerFont);
-		
-		//Separator:
-		Shape headerSepShape = peCreateService.createShape(outerContainerShape, false);
-		Polyline headerPolyline = gaService.createPolyline(headerSepShape);
-		setId(headerPolyline, ID_HEADER_SEPARATER);
-		
-		Shape preSepShape = peCreateService.createShape(outerContainerShape, false);
-		Polyline prePolyline = gaService.createPolyline(preSepShape);
-		setId(prePolyline, ID_PRE_SEP);
-		
-		Shape postSepShape = peCreateService.createShape(outerContainerShape, false);
-		Polyline postPolyline = gaService.createPolyline(postSepShape);
-		setId(postPolyline, ID_POST_SEP);
-		
-<<<<<<< HEAD
-=======
-		Shape hor1LineShape = peCreateService.createShape(outerContainerShape, false);
-		Polyline hor1Polyline = gaService.createPolyline(hor1LineShape);
-		setId(hor1Polyline, ID_HOR1_LINE);
-
-		Shape hor2LineShape = peCreateService.createShape(outerContainerShape, false);
-		Polyline hor2Polyline = gaService.createPolyline(hor2LineShape);
-		setId(hor2Polyline, ID_HOR2_LINE);
-		
->>>>>>> master
-		peCreateService.createChopboxAnchor(outerContainerShape);
-		peCreateService.createChopboxAnchor(textShape);
-
-		link(outerContainerShape, addedStatement);
-		link(textShape, addedStatement);
-		link(preShape, addedStatement.getPreCondition());
-<<<<<<< HEAD
-		link(postShape, addedStatement.getPostCondition());
-=======
-		link(textShapePreConditionMod, addedStatement.getPreCondition());
-		link(postShape, addedStatement.getPostCondition());
-		link(textShapePostConditionMod, addedStatement.getPostCondition());
->>>>>>> master
-		link(proveShape, addedStatement);
-
-		return outerContainerShape;
-	}
-
-	@Override
-	protected boolean layout(IdLayoutContext context, String id) {
-		boolean changesDone = false;
-		
-		GraphicsAlgorithm mainRectangle = context.getRootPictogramElement().getGraphicsAlgorithm();
-		GraphicsAlgorithm ga = context.getGraphicsAlgorithm();
-		int third = mainRectangle.getWidth() / 3;
-<<<<<<< HEAD
-=======
-		int thirdBlockHeight = (mainRectangle.getHeight() - 40)/3;
->>>>>>> master
-		
-		if (id.equals(ID_NAME_TEXT)) {
-			Graphiti.getGaService().setLocationAndSize(ga, third, 40, third, mainRectangle.getHeight() - 40);
-			changesDone = true;
-		} else if (id.equals(ID_PRE_TEXT)) {
-<<<<<<< HEAD
-			Graphiti.getGaService().setLocationAndSize(ga, 0, 40, third, mainRectangle.getHeight() - 40);
-			changesDone = true;
-		} else if (id.equals(ID_POST_TEXT)) {
-			Graphiti.getGaService().setLocationAndSize(ga, third * 2, 40, third, mainRectangle.getHeight() - 40); 
-=======
-			Graphiti.getGaService().setLocationAndSize(ga, 0, thirdBlockHeight+40, third, 2*thirdBlockHeight);
-			changesDone = true;
-		} else if (id.equals(ID_PRE_MOD)) {
-			Graphiti.getGaService().setLocationAndSize(ga, 0, 40, third, thirdBlockHeight);
-			changesDone = true;
-		} else if (id.equals(ID_POST_TEXT)) {
-			Graphiti.getGaService().setLocationAndSize(ga, third * 2, thirdBlockHeight+40, third, 2*thirdBlockHeight);
-			changesDone = true;
-		} else if (id.equals(ID_POST_MOD)) {
-			Graphiti.getGaService().setLocationAndSize(ga, third * 2, 40, third, thirdBlockHeight);
->>>>>>> master
-			changesDone = true;
-		} else if (id.equals(ID_IMAGE_PROVEN)) {
-			Graphiti.getGaService().setLocationAndSize(ga, mainRectangle.getWidth() - 20, 10, 10, 10);
-			changesDone = true;
-		//Header:
-		} else if (id.equals(ID_NAME_HEADER)) {
-<<<<<<< HEAD
-			Graphiti.getGaService().setLocationAndSize(ga, third, 20, third, 20); //mainrectangle anpassen
-=======
-			Graphiti.getGaService().setLocationAndSize(ga, third, 5, third, 20); // mainrectangle anpassen
-			changesDone = true;
-		} else if (id.equals(ID_NAME_HEADER2)) {
-			Graphiti.getGaService().setLocationAndSize(ga, third, 20, third, 20); // mainrectangle anpassen
->>>>>>> master
-			changesDone = true;
-		} else if (id.equals(ID_PRE_HEADER)) {
-			Graphiti.getGaService().setLocationAndSize(ga, 0, 20, third, 20); 
-			changesDone = true;
-		} else if (id.equals(ID_POST_HEADER)) {
-			Graphiti.getGaService().setLocationAndSize(ga, third * 2, 20, third, 20); 
-			changesDone = true;
-		//LINES:
-		} else if (id.equals(ID_HEADER_SEPARATER)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService().createPointList(
-					new int[] { 0, 40, mainRectangle.getWidth(), 40 });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-<<<<<<< HEAD
-		} else if (id.equals(ID_POST_SEP)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService().createPointList(
-					new int[] { third, 0, third, mainRectangle.getHeight() });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		} else if (id.equals(ID_PRE_SEP)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService().createPointList(
-					new int[] { third * 2, 0, third * 2, mainRectangle.getHeight() });
-=======
-		} else if (id.equals(ID_PRE_SEP)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService()
-					.createPointList(new int[] { third * 2, 0, third * 2, mainRectangle.getHeight() });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		} else if (id.equals(ID_HOR1_LINE)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService()
-					.createPointList(new int[] { 0, thirdBlockHeight+40, third, thirdBlockHeight+40 });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		} else if (id.equals(ID_POST_SEP)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService()
-					.createPointList(new int[] { third, 0, third, mainRectangle.getHeight() });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		} else if (id.equals(ID_HOR2_LINE)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService()
-					.createPointList(new int[] { 2*third, thirdBlockHeight+40, mainRectangle.getWidth(), thirdBlockHeight+40 });
->>>>>>> master
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		}
-
-		return changesDone;
-	}
-	
-	@Override
-	protected IReason updateNeeded(IdUpdateContext context, String id) {
-		if(context.getGraphicsAlgorithm() instanceof MultiText && context.getDomainObject() instanceof ReturnStatement) {
-			MultiText nameText = (MultiText) context.getGraphicsAlgorithm();
-			ReturnStatement domainObject = (ReturnStatement) context.getDomainObject();
-			if (domainObject.getName() == null || !domainObject.getName().equals(nameText.getValue())) {
-				return Reason.createTrueReason("Name differs. Expected: '" + domainObject.getName() + "'");
-			}
-		} 
-		else if (id.equals(ID_MAIN_RECTANGLE)) {
-			RoundedRectangle rectangle = (RoundedRectangle) context.getGraphicsAlgorithm();
-			AbstractStatement domainObject = (AbstractStatement) context.getDomainObject();
-			if (domainObject.isProven() && 
-					((rectangle.getForeground() != null && !rectangle.getForeground().equals(manageColor(IColorConstant.DARK_GREEN))) 
-							|| rectangle.getForeground() == null)) {
-				return Reason.createTrueReason("Statement is proven. Expected green color.");
-<<<<<<< HEAD
-			} else if (!domainObject.isProven() && 
-					((rectangle.getForeground() != null && rectangle.getForeground().equals(manageColor(IColorConstant.DARK_GREEN))) 
-=======
-			} else if (!domainObject.isProven() && domainObject.isTested() && 
-					((rectangle.getForeground() != null && !rectangle.getForeground().equals(manageColor(IColorConstant.LIGHT_ORANGE))) 
-							|| rectangle.getForeground() == null)) {
-				return Reason.createTrueReason("Statement is tested. Expected orange color.");
-			} else if (!domainObject.isProven() && !domainObject.isTested() &&
-					((rectangle.getForeground() != null && (rectangle.getForeground().equals(manageColor(IColorConstant.DARK_GREEN)) || rectangle.getForeground().equals(manageColor(IColorConstant.LIGHT_ORANGE)))) 
->>>>>>> master
-							|| rectangle.getForeground() == null)) {
-				return Reason.createTrueReason("Statement is not proven. Expected red color.");
-			} 
-		} else if (id.equals(ID_IMAGE_PROVEN)) {
-			AbstractStatement domainObject = (AbstractStatement) context.getDomainObject();
-			 Image image = (Image) context.getGraphicsAlgorithm();
-			if (domainObject.isProven() && image.getId().equals(CbCImageProvider.IMG_UNPROVEN)) {
-				return Reason.createTrueReason("Statement is proven. Expected green color.");
-			} else if (!domainObject.isProven() && image.getId().equals(CbCImageProvider.IMG_PROVEN)) {
-				return Reason.createTrueReason("Statement is not proven. Expected red color.");
-			} 
-		}
-		
-		if(HighlightHelper.instance.needsInitialHighlightUpdate(context)) {
-			return Reason.createTrueReason("Element needs to be highlighted.");
-		}
-		return Reason.createFalseReason();
-	}
-
-	@Override
-	protected boolean update(IdUpdateContext context, String id) {
-		if(context.getGraphicsAlgorithm() instanceof MultiText && context.getDomainObject() instanceof AbstractStatement) {
-			MultiText nameText = (MultiText) context.getGraphicsAlgorithm();
-			AbstractStatement domainObject = (AbstractStatement) context.getDomainObject();
-			nameText.setValue(domainObject.getName());
-			return true;
-		} 
-		else if (id.equals(ID_MAIN_RECTANGLE)) {
-			RoundedRectangle rectangle = (RoundedRectangle) context.getGraphicsAlgorithm();
-			AbstractStatement domainObject = (AbstractStatement) context.getDomainObject();
-			if (domainObject.isProven()) {
-				rectangle.setForeground(manageColor(IColorConstant.DARK_GREEN));
-				if(domainObject.getParent()!= null) {
-					IPeService pe = Graphiti.getPeService();
-					EObject[] objArray = {domainObject.getParent()};
-					Object[] obj =  pe.getLinkedPictogramElements(objArray, getDiagram());
-					Shape pElement = (Shape) obj[0];
-					if (pElement.getContainer() != null) updatePictogramElement(pElement.getContainer());
-				}
-<<<<<<< HEAD
-=======
-			} else if (domainObject.isTested()) {
-				rectangle.setForeground(manageColor(IColorConstant.LIGHT_ORANGE));
-				if(domainObject.getParent()!= null) {
-					IPeService pe = Graphiti.getPeService();
-					EObject[] objArray = {domainObject.getParent()};
-					Object[] obj =  pe.getLinkedPictogramElements(objArray, getDiagram());
-					Shape pElement = (Shape) obj[0];
-					if (pElement.getContainer() != null) updatePictogramElement(pElement.getContainer());
-				}		
->>>>>>> master
-			} else {
-				rectangle.setForeground(manageColor(IColorConstant.RED));
-				if(domainObject.getParent()!= null) {
-					IPeService pe = Graphiti.getPeService();
-					EObject[] objArray = {domainObject.getParent()};
-					Object[] obj =  pe.getLinkedPictogramElements(objArray, getDiagram());
-					if (obj.length > 0) {
-						Shape pElement = (Shape) obj[0];
-						if (pElement.getContainer() != null) updatePictogramElement(pElement.getContainer());
-					}
-				}
-			}
-			
-			HighlightHelper.instance.handleHighlightDrawing(context, rectangle);
-			updateParent(domainObject);
-			return true;
-		} else if (id.equals(ID_IMAGE_PROVEN)) {
-			AbstractStatement domainObject = (AbstractStatement) context.getDomainObject();
-			 Image image = (Image) context.getGraphicsAlgorithm();
-			if (domainObject.isProven()) {
-				image.setId(CbCImageProvider.IMG_PROVEN);
-			} else {
-				image.setId(CbCImageProvider.IMG_UNPROVEN);
-			} 
-		}
-		return false;
-	}
-	
-	private void updateParent(AbstractStatement statement) {
-		if (statement.getParent() != null) {
-			IPeService pe = Graphiti.getPeService();
-			EObject[] objArray = { statement.getParent() };
-			Object[] obj = pe.getLinkedPictogramElements(objArray, getDiagram());
-			if (obj.length > 0) {
-				Shape pElement = (Shape) obj[0];
-				if (pElement.getContainer() != null)
-					updatePictogramElement(pElement.getContainer());
-			}
-		}
-	}
-
-	@Override
-	public int getEditingType() {
-		return TYPE_MULTILINETEXT;
-	}
-
-	@Override
-	public boolean canDirectEdit(IDirectEditingContext context) {
-		Object domainObject = getBusinessObjectForPictogramElement(context.getPictogramElement());
-		GraphicsAlgorithm ga = context.getGraphicsAlgorithm();
-		if (domainObject instanceof AbstractStatement && ga instanceof MultiText) {
-			return true;
-		}
-		return false;
-	}
-
-	@Override
-	public String getInitialValue(IDirectEditingContext context) {
-		AbstractStatement statement = (AbstractStatement) getBusinessObjectForPictogramElement(context.getPictogramElement());
-		return statement.getName();
-	}
-
-	@Override
-	public String checkValueValid(String value, IDirectEditingContext context) {
-		if (value == null || value.length() == 0) {
-			return "Statement must not be empty";
-		}
-		if (value.contains(";") && !CompareMethodBodies.readAndTestMethodBodyWithJaMoPP2(value)) {
-			return "Statement has not the correct syntax.";
-		}
-		return null;
-	}
-
-	@Override
-	public void setValue(String value, IDirectEditingContext context) {
-		AbstractStatement statement = (AbstractStatement) getBusinessObjectForPictogramElement(context.getPictogramElement());
-		statement.setName(value);
-		statement.setProven(false);
-<<<<<<< HEAD
-		JavaVariables vars = null;
-		for (Shape shape : getDiagram().getChildren()) {
-			Object obj = getBusinessObjectForPictogramElement(shape); 
-			if (obj instanceof JavaVariables) {
-				vars = (JavaVariables) obj;
-			}
-		}
-		UpdateModifiableOfConditions.setVars(vars);
-		UpdateModifiableOfConditions.updateAssignmentStatement(statement, new FileUtil(getDiagram().eResource().getURI().toPlatformString(true)));
-=======
-		statement.setTested(false);
-		TestStatement.setPathTested(statement, false);
-		updateParent(statement);
-		DiagramPartsExtractor extractor = new DiagramPartsExtractor(getDiagram());
-		JavaVariables vars = extractor.getVars();
-		UpdateModifiableOfConditions.setVars(vars);
-		UpdateModifiableOfConditions.updateAssignmentStatement(statement, new FileUtil(getDiagram().eResource().getURI().toPlatformString(true)));
-		
-		//Start of IFbC
-		final IProject project = GetProjectUtil.getProjectForDiagram(getDiagram());
-		final Lattice lattice = Lattices.getLatticeForProject(project);
-		if (lattice != null) {
-			try {
-				UpdateInformationFlow.updateInformationFlow(project.getName(), statement, lattice);
-			} catch (IFbCException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-		
->>>>>>> master
-		updatePictogramElement(context.getPictogramElement());
-	}
-}
-
diff --git a/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/SelectionPattern.java.orig b/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/SelectionPattern.java.orig
deleted file mode 100644
index 3f9f1caa9..000000000
--- a/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/SelectionPattern.java.orig
+++ /dev/null
@@ -1,712 +0,0 @@
-package de.tu_bs.cs.isf.cbc.tool.patterns;
-
-import java.util.List;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.graphiti.features.IReason;
-import org.eclipse.graphiti.features.context.IAddContext;
-import org.eclipse.graphiti.features.context.ICreateContext;
-import org.eclipse.graphiti.features.impl.Reason;
-import org.eclipse.graphiti.mm.algorithms.GraphicsAlgorithm;
-import org.eclipse.graphiti.mm.algorithms.Image;
-import org.eclipse.graphiti.mm.algorithms.MultiText;
-import org.eclipse.graphiti.mm.algorithms.Polyline;
-import org.eclipse.graphiti.mm.algorithms.RoundedRectangle;
-import org.eclipse.graphiti.mm.algorithms.Text;
-import org.eclipse.graphiti.mm.algorithms.styles.Font;
-import org.eclipse.graphiti.mm.algorithms.styles.Orientation;
-import org.eclipse.graphiti.mm.algorithms.styles.Point;
-import org.eclipse.graphiti.mm.pictograms.ContainerShape;
-import org.eclipse.graphiti.mm.pictograms.Diagram;
-import org.eclipse.graphiti.mm.pictograms.PictogramElement;
-import org.eclipse.graphiti.mm.pictograms.Shape;
-import org.eclipse.graphiti.pattern.IPattern;
-import org.eclipse.graphiti.pattern.id.IdLayoutContext;
-import org.eclipse.graphiti.pattern.id.IdPattern;
-import org.eclipse.graphiti.pattern.id.IdUpdateContext;
-import org.eclipse.graphiti.services.Graphiti;
-import org.eclipse.graphiti.services.IGaService;
-import org.eclipse.graphiti.services.IPeCreateService;
-import org.eclipse.graphiti.services.IPeService;
-import org.eclipse.graphiti.util.IColorConstant;
-import org.eclipse.graphiti.util.PredefinedColoredAreas;
-
-import de.tu_bs.cs.isf.cbc.cbcmodel.AbstractStatement;
-import de.tu_bs.cs.isf.cbc.cbcmodel.CbcmodelFactory;
-import de.tu_bs.cs.isf.cbc.cbcmodel.Condition;
-import de.tu_bs.cs.isf.cbc.cbcmodel.SelectionStatement;
-import de.tu_bs.cs.isf.cbc.tool.diagram.CbCImageProvider;
-import de.tu_bs.cs.isf.cbc.tool.helper.HighlightHelper;
-
-/**
- * Class that creates the graphical representation of Conditions
- * 
- * @author Tobias
- *
- */
-public class SelectionPattern extends IdPattern implements IPattern {
-
-	private static final String ID_STATEMENT_TEXT = "statementSelNameText";
-	private static final String ID_CONDITION_TEXT = "conditionSelText";
-	private static final String ID_MAIN_RECTANGLE = "mainRectangle";
-	private static final String ID_NAME_TEXT = "nameText";
-	private static final String ID_PRE_TEXT = "preText";
-<<<<<<< HEAD
-	private static final String ID_POST_TEXT = "postText";
-=======
-	private static final String ID_PRE_MOD = "preConditionModifiables";
-	private static final String ID_POST_TEXT = "postText";
-	private static final String ID_POST_MOD = "postConditionModifiables";
->>>>>>> master
-	private static final String ID_IMAGE_PROVEN = "imageproven";
-	// HEADERS:
-	private static final String ID_GUARD_HEADER = "guardHeader";
-	private static final String ID_PRE_HEADER = "preHeader";
-	private static final String ID_STATEMENT_HEADER = "statementHeader";
-	private static final String ID_POST_HEADER = "postHeader";
-	// lines:
-	private static final String ID_HOR1_LINE = "hor1Line";
-	private static final String ID_HOR2_LINE = "hor2Line";
-	private static final String ID_HOR3_LINE = "hor3Line";
-	private static final String ID_HOR4_LINE = "hor4Line";
-	private static final String ID_HOR5_LINE = "hor5Line";
-	private static final String ID_HOR6_LINE = "hor6Line";
-	private static final String ID_HOR7_LINE = "hor7Line";
-	private static final String ID_HOR8_LINE = "hor8Line";
-<<<<<<< HEAD
-=======
-	private static final String ID_HOR9_LINE = "hor9Line";
-	private static final String ID_HOR10_LINE = "hor10Line";
->>>>>>> master
-	private static final String ID_VER1_LINE = "ver1Line"; // in guards
-	private static final String ID_VER2_LINE = "ver2Line"; // in pre conds
-	private static final String ID_VER3_LINE = "ver3Line"; // in statements
-
-	/**
-	 * Constructor of the class
-	 */
-	public SelectionPattern() {
-		super();
-	}
-
-	@Override
-	public String getCreateName() {
-		return "SelectionStatement";
-	}
-
-	@Override
-	public String getCreateDescription() {
-		return "Create a SelectionStatement.";
-	}
-
-	@Override
-	public boolean isMainBusinessObjectApplicable(Object mainBusinessObject) {
-		return mainBusinessObject instanceof SelectionStatement;
-	}
-
-	@Override
-	public boolean canCreate(ICreateContext context) {
-		return context.getTargetContainer() instanceof Diagram;
-	}
-
-	@Override
-	public Object[] create(ICreateContext context) {
-		SelectionStatement selectionStatement = CbcmodelFactory.eINSTANCE.createSelectionStatement();
-		selectionStatement.setName("selectionStatement");
-		AbstractStatement statement = CbcmodelFactory.eINSTANCE.createAbstractStatement();
-		statement.setName("statement");
-		selectionStatement.getCommands().add(statement);
-		Condition condition = CbcmodelFactory.eINSTANCE.createCondition();
-		condition.setName("guard");
-		selectionStatement.getGuards().add(condition);
-		Condition pre = CbcmodelFactory.eINSTANCE.createCondition();
-		pre.setName("");
-		statement.setPreCondition(pre);
-		Condition post = CbcmodelFactory.eINSTANCE.createCondition();
-		post.setName("");
-		statement.setPostCondition(post);
-
-		addGraphicalRepresentation(context, selectionStatement);
-		return new Object[] { selectionStatement };
-	}
-
-	@Override
-	public boolean canAdd(IAddContext context) {
-		return super.canAdd(context) && context.getTargetContainer() instanceof Diagram;
-	}
-
-	@Override
-	public PictogramElement doAdd(IAddContext context) {
-		manageColor(IColorConstant.DARK_GREEN);
-		Diagram targetDiagram = (Diagram) context.getTargetContainer();
-		SelectionStatement addedStatement = (SelectionStatement) context.getNewObject();
-		IPeCreateService peCreateService = Graphiti.getPeCreateService();
-		IGaService gaService = Graphiti.getGaService();
-
-<<<<<<< HEAD
-		int width = context.getWidth() <= 0 ? 200 : context.getWidth();
-		int height = context.getHeight() <= 0 ? 300 : context.getHeight();
-		// font:
-=======
-		int width = context.getWidth() <= 0 ? 300 : context.getWidth();
-		int height = context.getHeight() <= 0 ? 500 : context.getHeight();
-		// Font:
->>>>>>> master
-		Font headerFont = gaService.manageFont(getDiagram(), "Arial", 9, false, true);
-
-		// Main contents area
-		ContainerShape outerContainerShape = peCreateService.createContainerShape(targetDiagram, true);
-		RoundedRectangle mainRectangle = gaService.createRoundedRectangle(outerContainerShape, 20, 20);
-		mainRectangle.setFilled(true);
-		gaService.setRenderingStyle(mainRectangle, PredefinedColoredAreas.getBlueWhiteAdaptions());
-		mainRectangle.setForeground(manageColor(IColorConstant.RED));
-		mainRectangle.setLineWidth(2);
-		setId(mainRectangle, ID_MAIN_RECTANGLE);
-		gaService.setLocationAndSize(mainRectangle, context.getX(), context.getY(), width, height);
-
-		// create link and wire it
-		link(outerContainerShape, addedStatement);
-
-		Shape textShapeName = peCreateService.createShape(outerContainerShape, false);
-		MultiText nameText = gaService.createMultiText(textShapeName, "SelectionStatement IF..FI");
-		setId(nameText, ID_NAME_TEXT);
-		nameText.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		nameText.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-<<<<<<< HEAD
-=======
-		nameText.setFont(headerFont);
->>>>>>> master
-
-		Shape proveShape = peCreateService.createShape(outerContainerShape, false);
-		Image image = gaService.createImage(proveShape, CbCImageProvider.IMG_UNPROVEN);
-		setId(image, ID_IMAGE_PROVEN);
-
-		// HEADERS:
-
-		Shape guardHeaderShape = peCreateService.createShape(outerContainerShape, false);
-		Text guardHeader = gaService.createText(guardHeaderShape, "guards");
-		setId(guardHeader, ID_GUARD_HEADER);
-		guardHeader.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		guardHeader.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		guardHeader.setFont(headerFont);
-
-		Shape preHeaderShape = peCreateService.createShape(outerContainerShape, false);
-		Text preHeader = Graphiti.getGaService().createText(preHeaderShape, "precondition");
-		setId(preHeader, ID_PRE_HEADER);
-		preHeader.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		preHeader.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		preHeader.setFont(headerFont);
-
-		Shape statementHeaderShape = peCreateService.createShape(outerContainerShape, false);
-		Text statementHeader = Graphiti.getGaService().createText(statementHeaderShape, "statements");
-		setId(statementHeader, ID_STATEMENT_HEADER);
-		statementHeader.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		statementHeader.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		statementHeader.setFont(headerFont);
-
-		Shape postHeaderShape = peCreateService.createShape(outerContainerShape, false);
-		Text postHeader = Graphiti.getGaService().createText(postHeaderShape, "postcondition");
-		setId(postHeader, ID_POST_HEADER);
-		postHeader.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		postHeader.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		postHeader.setFont(headerFont);
-
-		// LINES:
-
-		Shape hor1Shape = peCreateService.createShape(outerContainerShape, false);
-		Polyline hor1line = gaService.createPolyline(hor1Shape);
-		setId(hor1line, ID_HOR1_LINE);
-
-		Shape hor2Shape = peCreateService.createShape(outerContainerShape, false);
-		Polyline hor2line = gaService.createPolyline(hor2Shape);
-		setId(hor2line, ID_HOR2_LINE);
-
-		Shape hor3Shape = peCreateService.createShape(outerContainerShape, false);
-		Polyline hor3line = gaService.createPolyline(hor3Shape);
-		setId(hor3line, ID_HOR3_LINE);
-
-		Shape hor4Shape = peCreateService.createShape(outerContainerShape, false);
-		Polyline hor4line = gaService.createPolyline(hor4Shape);
-		setId(hor4line, ID_HOR4_LINE);
-
-		Shape hor5Shape = peCreateService.createShape(outerContainerShape, false);
-		Polyline hor5line = gaService.createPolyline(hor5Shape);
-		setId(hor5line, ID_HOR5_LINE);
-
-		Shape hor6Shape = peCreateService.createShape(outerContainerShape, false);
-		Polyline hor6line = gaService.createPolyline(hor6Shape);
-		setId(hor6line, ID_HOR6_LINE);
-
-		Shape hor7Shape = peCreateService.createShape(outerContainerShape, false);
-		Polyline hor7line = gaService.createPolyline(hor7Shape);
-		setId(hor7line, ID_HOR7_LINE);
-
-		Shape hor8Shape = peCreateService.createShape(outerContainerShape, false);
-		Polyline hor8line = gaService.createPolyline(hor8Shape);
-		setId(hor8line, ID_HOR8_LINE);
-<<<<<<< HEAD
-=======
-		
-		Shape hor9Shape = peCreateService.createShape(outerContainerShape, false);
-		Polyline hor9line = gaService.createPolyline(hor9Shape);
-		setId(hor9line, ID_HOR9_LINE);
-		
-		Shape hor10Shape = peCreateService.createShape(outerContainerShape, false);
-		Polyline hor10line = gaService.createPolyline(hor10Shape);
-		setId(hor10line, ID_HOR10_LINE);
->>>>>>> master
-
-		peCreateService.createChopboxAnchor(outerContainerShape);
-
-		link(outerContainerShape, addedStatement);
-
-		link(proveShape, addedStatement);
-
-		return outerContainerShape;
-	}
-
-	@Override
-	protected boolean layout(IdLayoutContext context, String id) {
-		boolean changesDone = false;
-
-		GraphicsAlgorithm mainRectangle = context.getRootPictogramElement().getGraphicsAlgorithm();
-		SelectionStatement statement = (SelectionStatement) getBusinessObjectForPictogramElement(
-				context.getRootPictogramElement());
-		GraphicsAlgorithm ga = context.getGraphicsAlgorithm();
-		int width = mainRectangle.getWidth();
-		int sizeHeader = 20;
-		int sizeName = 40; // name = SelectionStatement IF..FI
-		int sizeBlock = (mainRectangle.getHeight() - sizeName) / 4 - sizeHeader; // Height from one Block
-		int positionLine1 = mainRectangle.getHeight() - (mainRectangle.getHeight() - sizeName) / 4 * 4 + 20; // guard
-		int positionLine2 = mainRectangle.getHeight() - (mainRectangle.getHeight() - sizeName) / 4 * 3 + 20; // pre
-		int positionLine3 = mainRectangle.getHeight() - (mainRectangle.getHeight() - sizeName) / 4 * 2 + 20; // statement
-		int positionLine4 = mainRectangle.getHeight() - (mainRectangle.getHeight() - sizeName) / 4 * 1 + 20; // post
-<<<<<<< HEAD
-=======
-		int positionLine5 = mainRectangle.getHeight() - (mainRectangle.getHeight() - sizeName) / 4 * 0 + 20; // virtual line
-		int positionPreModLine = (positionLine3-positionLine2-20)/3 + positionLine2; // modifiables pre
-		int positionPostModLine = (positionLine5-positionLine4-20)/3 + positionLine4; // modifiables post
->>>>>>> master
-		if (statement.getCommands().size() > 1) {
-			width = width / statement.getCommands().size();
-		}
-
-		if (id.equals(ID_NAME_TEXT)) {
-			Graphiti.getGaService().setLocationAndSize(ga, 0, 0, mainRectangle.getWidth(), sizeName);
-			changesDone = true;
-		} else if (id.equals(ID_CONDITION_TEXT)) {
-			int index = getIndex(context.getGraphicsAlgorithm());
-			Graphiti.getGaService().setLocationAndSize(ga, width * index, positionLine1, width, sizeBlock);
-			changesDone = true;
-		} else if (id.equals(ID_STATEMENT_TEXT)) {
-			int index = getIndex(context.getGraphicsAlgorithm());
-			Graphiti.getGaService().setLocationAndSize(ga, width * index, positionLine3, width, sizeBlock);
-			changesDone = true;
-		} else if (id.equals(ID_PRE_TEXT)) {
-			int index = getIndex(context.getGraphicsAlgorithm());
-<<<<<<< HEAD
-			Graphiti.getGaService().setLocationAndSize(ga, width * index, positionLine2, width, sizeBlock);
-=======
-			Graphiti.getGaService().setLocationAndSize(ga, width * index, positionPreModLine, width, (sizeBlock/3)*2);
-			changesDone = true;
-		} else if (id.equals(ID_PRE_MOD)) {
-			Graphiti.getGaService().setLocationAndSize(ga, 0, positionLine2, mainRectangle.getWidth(), sizeBlock/3);
->>>>>>> master
-			changesDone = true;
-		} else if (id.equals(ID_IMAGE_PROVEN)) {
-			Graphiti.getGaService().setLocationAndSize(ga, mainRectangle.getWidth() - 20, 10, 10, 10);
-			changesDone = true;
-			// Header:
-		} else if (id.equals(ID_POST_TEXT) && getIndex(context.getGraphicsAlgorithm()) == 0) {
-<<<<<<< HEAD
-			Graphiti.getGaService().setLocationAndSize(ga, 0, positionLine4, mainRectangle.getWidth(), sizeBlock);
-=======
-			Graphiti.getGaService().setLocationAndSize(ga, 0, positionPostModLine, mainRectangle.getWidth(), (sizeBlock/3)*2);
-			changesDone = true;
-		} else if (id.equals(ID_POST_MOD)) {
-			Graphiti.getGaService().setLocationAndSize(ga, 0, positionLine4, mainRectangle.getWidth(), sizeBlock/3);
->>>>>>> master
-			changesDone = true;
-		} else if (id.equals(ID_GUARD_HEADER)) {
-			Graphiti.getGaService().setLocationAndSize(ga, 0, positionLine1 - sizeHeader, mainRectangle.getWidth(),
-					sizeHeader);
-			changesDone = true;
-		} else if (id.equals(ID_PRE_HEADER)) {
-			Graphiti.getGaService().setLocationAndSize(ga, 0, positionLine2 - sizeHeader, mainRectangle.getWidth(),
-					sizeHeader);
-			changesDone = true;
-		} else if (id.equals(ID_STATEMENT_HEADER)) {
-			Graphiti.getGaService().setLocationAndSize(ga, 0, positionLine3 - sizeHeader, mainRectangle.getWidth(),
-					sizeHeader);
-			changesDone = true;
-		} else if (id.equals(ID_POST_HEADER)) {
-			Graphiti.getGaService().setLocationAndSize(ga, 0, positionLine4 - sizeHeader, mainRectangle.getWidth(),
-					sizeHeader);
-			changesDone = true;
-			// lines:
-		} else if (id.equals(ID_HOR1_LINE)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService().createPointList(
-					new int[] { 0, positionLine1 - sizeHeader, mainRectangle.getWidth(), positionLine1 - sizeHeader });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		} else if (id.equals(ID_HOR2_LINE)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService()
-					.createPointList(new int[] { 0, positionLine1, mainRectangle.getWidth(), positionLine1 });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		} else if (id.equals(ID_HOR3_LINE)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService().createPointList(
-					new int[] { 0, positionLine2 - sizeHeader, mainRectangle.getWidth(), positionLine2 - sizeHeader });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		} else if (id.equals(ID_HOR4_LINE)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService()
-					.createPointList(new int[] { 0, positionLine2, mainRectangle.getWidth(), positionLine2 });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		} else if (id.equals(ID_HOR5_LINE)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService().createPointList(
-					new int[] { 0, positionLine3 - sizeHeader, mainRectangle.getWidth(), positionLine3 - sizeHeader });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		} else if (id.equals(ID_HOR6_LINE)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService()
-					.createPointList(new int[] { 0, positionLine3, mainRectangle.getWidth(), positionLine3 });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		} else if (id.equals(ID_HOR7_LINE)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService().createPointList(
-					new int[] { 0, positionLine4 - sizeHeader, mainRectangle.getWidth(), positionLine4 - sizeHeader });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		} else if (id.equals(ID_HOR8_LINE)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService()
-					.createPointList(new int[] { 0, positionLine4, mainRectangle.getWidth(), positionLine4 });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-<<<<<<< HEAD
-=======
-		} else if (id.equals(ID_HOR9_LINE)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService()
-					.createPointList(new int[] { 0, positionPreModLine, mainRectangle.getWidth(), positionPreModLine });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		} else if (id.equals(ID_HOR10_LINE)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService()
-					.createPointList(new int[] { 0, positionPostModLine, mainRectangle.getWidth(), positionPostModLine });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
->>>>>>> master
-		} else if (id.equals(ID_VER1_LINE)) {
-			int index = getIndex(context.getGraphicsAlgorithm());
-			if (index > 0) {
-				Polyline polyline = (Polyline) ga;
-				polyline.getPoints().clear();
-				List<Point> pointList = Graphiti.getGaService().createPointList(
-						new int[] { width * index, positionLine1, width * index, positionLine2 - sizeHeader });
-				polyline.getPoints().addAll(pointList);
-			} else {
-				Polyline polyline = (Polyline) ga;
-				polyline.getPoints().clear();
-			}
-			changesDone = true;
-		} else if (id.equals(ID_VER2_LINE)) {
-			int index = getIndex(context.getGraphicsAlgorithm());
-			if (index > 0) {
-				Polyline polyline = (Polyline) ga;
-				polyline.getPoints().clear();
-				List<Point> pointList = Graphiti.getGaService().createPointList(
-<<<<<<< HEAD
-						new int[] { width * index, positionLine2, width * index, positionLine3 - sizeHeader });
-=======
-						new int[] { width * index, positionPreModLine, width * index, positionLine3 - sizeHeader });
->>>>>>> master
-				polyline.getPoints().addAll(pointList);
-			} else {
-				Polyline polyline = (Polyline) ga;
-				polyline.getPoints().clear();
-			}
-			changesDone = true;
-		} else if (id.equals(ID_VER3_LINE)) {
-			int index = getIndex(context.getGraphicsAlgorithm());
-			if (index > 0) {
-				Polyline polyline = (Polyline) ga;
-				polyline.getPoints().clear();
-				List<Point> pointList = Graphiti.getGaService().createPointList(
-						new int[] { width * index, positionLine3, width * index, positionLine4 - sizeHeader });
-				polyline.getPoints().addAll(pointList);
-			} else {
-				Polyline polyline = (Polyline) ga;
-				polyline.getPoints().clear();
-			}
-		}
-		changesDone = true;
-
-		return changesDone;
-	}
-
-	@Override
-	protected IReason updateNeeded(IdUpdateContext context, String id) {
-		if (id.equals(ID_MAIN_RECTANGLE)) {
-			ContainerShape containerShape = (ContainerShape) context.getPictogramElement();
-			SelectionStatement statement = (SelectionStatement) context.getDomainObject();
-<<<<<<< HEAD
-			if (containerShape.getChildren().size() - 14 != statement.getCommands().size() * 7) {
-=======
-			if (containerShape.getChildren().size() - 16 != statement.getCommands().size() * 9) {
->>>>>>> master
-				return Reason.createTrueReason("Number of Commands and Guards differ. Expected: "
-						+ statement.getCommands().size() + " " + containerShape.getChildren().size());
-			}
-			RoundedRectangle rectangle = (RoundedRectangle) context.getGraphicsAlgorithm();
-			if (checkIsProven(statement) && ((rectangle.getForeground() != null
-					&& !rectangle.getForeground().equals(manageColor(IColorConstant.DARK_GREEN)))
-					|| rectangle.getForeground() == null)) {
-				return Reason.createTrueReason("Statement is proven. Expected green color.");
-<<<<<<< HEAD
-			} else if (!checkIsProven(statement) && ((rectangle.getForeground() != null
-					&& rectangle.getForeground().equals(manageColor(IColorConstant.DARK_GREEN)))
-					|| rectangle.getForeground() == null)) {
-				return Reason.createTrueReason("Statement is not proven. Expected red color.");
-=======
-			} else if (!statement.isProven() && statement.isTested() 
-					&& ((rectangle.getForeground() != null && !rectangle.getForeground().equals(manageColor(IColorConstant.LIGHT_ORANGE))) 
-					|| rectangle.getForeground() == null)) {
-				return Reason.createTrueReason("Statement is tested. Expected orange color.");
-			} else if (!checkIsProven(statement) && !statement.isTested() && ((rectangle.getForeground() != null
-					&& rectangle.getForeground().equals(manageColor(IColorConstant.DARK_GREEN)) || rectangle.getForeground().equals(manageColor(IColorConstant.LIGHT_ORANGE)))
-					|| rectangle.getForeground() == null)) {
-				return Reason.createTrueReason("Statement is not proven or tested. Expected red color.");
->>>>>>> master
-			}
-		} else if (id.equals(ID_IMAGE_PROVEN)) {
-			SelectionStatement domainObject = (SelectionStatement) context.getDomainObject();
-			Image image = (Image) context.getGraphicsAlgorithm();
-			if (checkIsProven(domainObject) && image.getId().equals(CbCImageProvider.IMG_UNPROVEN)) {
-				return Reason.createTrueReason("Statement is proven. Expected green color.");
-			} else if (!checkIsProven(domainObject) && image.getId().equals(CbCImageProvider.IMG_PROVEN)) {
-				return Reason.createTrueReason("Statement is not proven. Expected red color.");
-			}
-		}
-		
-		if(HighlightHelper.instance.needsInitialHighlightUpdate(context)) {
-			return Reason.createTrueReason("Element needs to be highlighted.");
-		}
-		return Reason.createFalseReason();
-	}
-
-	@Override
-	protected boolean update(IdUpdateContext context, String id) {
-		if (id.equals(ID_MAIN_RECTANGLE)) {
-			ContainerShape containerShape = (ContainerShape) context.getPictogramElement();
-			SelectionStatement statement = (SelectionStatement) context.getDomainObject();
-<<<<<<< HEAD
-			// 7 = number of graphics elements in update (vertical lines + blocks)
-			// 13 = number of graphics in doAdd (horizontal lines + header + name)
-			while (containerShape.getChildren().size() - 14 != statement.getCommands().size() * 7) {
-				// if (containerShape.getChildren().size() - 1 != statement.getCommands().size()
-				// * 4) {
-				EList<AbstractStatement> childStatements = ((SelectionStatement) context.getDomainObject())
-						.getCommands();
-				int newIndex = (containerShape.getChildren().size() - 14) / 7;
-				// int newIndex = childStatements.size() - 1;
-=======
-			// 9 = number of graphics elements in update (vertical lines + blocks)
-			// 16 = number of graphics in doAdd (horizontal lines + header + name)
-			while (containerShape.getChildren().size() - 16 != statement.getCommands().size() * 9) {
-				EList<AbstractStatement> childStatements = ((SelectionStatement) context.getDomainObject()).getCommands();
-				int newIndex = (containerShape.getChildren().size() - 16) / 9;
->>>>>>> master
-				AbstractStatement childStatement = childStatements.get(newIndex);
-				Shape shapeText = Graphiti.getPeCreateService()
-						.createShape((ContainerShape) context.getPictogramElement(), true);
-				MultiText statementNameText = Graphiti.getGaService().createMultiText(shapeText,
-						childStatement.getName());
-				setId(statementNameText, ID_STATEMENT_TEXT);
-				setIndex(statementNameText, newIndex);
-				statementNameText.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-				statementNameText.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-				IPeCreateService peCreateService = Graphiti.getPeCreateService();
-				peCreateService.createChopboxAnchor(shapeText);
-				link(shapeText, childStatement);
-
-				Shape shapeTextPre = Graphiti.getPeCreateService()
-						.createShape((ContainerShape) context.getPictogramElement(), false);
-				MultiText preNameText = Graphiti.getGaService().createMultiText(shapeTextPre,
-						"{" + childStatement.getPreCondition().getName() + "}");
-				setId(preNameText, ID_PRE_TEXT);
-				setIndex(preNameText, newIndex);
-				preNameText.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-				preNameText.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-				link(shapeTextPre, childStatement.getPreCondition());
-<<<<<<< HEAD
-=======
-				
-				Shape textShapePreConditionMod = Graphiti.getPeCreateService()
-						.createShape((ContainerShape) context.getPictogramElement(), true);
-				MultiText preConditionTextMod = Graphiti.getGaService().createMultiText(textShapePreConditionMod, "");
-				setId(preConditionTextMod, ID_PRE_MOD);
-				String modString = "";
-				for (String s : childStatement.getPreCondition().getModifiables()) {
-					modString += s + ", ";
-				}
-				if (newIndex == 0) {
-					preConditionTextMod.setValue("modifiable(" + (modString.equals("") ? "" : modString.substring(0, modString.length() - 2)) + ");");
-				} else {
-					preConditionTextMod.setValue("");
-				}
-				preConditionTextMod.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-				preConditionTextMod.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-				link(textShapePreConditionMod, childStatement.getPreCondition());
->>>>>>> master
-
-				Shape shapeTextPost = Graphiti.getPeCreateService()
-						.createShape((ContainerShape) context.getPictogramElement(), false);
-				MultiText postNameText = Graphiti.getGaService().createMultiText(shapeTextPost,
-						"{" + childStatement.getPostCondition().getName() + "}");
-				setId(postNameText, ID_POST_TEXT);
-				setIndex(postNameText, newIndex);
-				postNameText.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-				postNameText.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-				link(shapeTextPost, childStatement.getPostCondition());
-<<<<<<< HEAD
-=======
-				
-				Shape textShapePostConditionMod = Graphiti.getPeCreateService()
-						.createShape((ContainerShape) context.getPictogramElement(), true);
-				MultiText postConditionTextMod = Graphiti.getGaService().createMultiText(textShapePostConditionMod, "");
-				setId(postConditionTextMod, ID_POST_MOD);
-				modString = "";
-				if (childStatement.getParent() != null) {
-					for (String s : childStatement.getParent().getPostCondition().getModifiables()) {
-						modString += s + ", ";
-					}
-				}
-				if (newIndex == 0) {
-					postConditionTextMod.setValue("modifiable(" + (modString.equals("") ? "" : modString.substring(0, modString.length() - 2)) + ");");
-				} else {
-					postConditionTextMod.setValue("");
-				}
-				postConditionTextMod.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-				postConditionTextMod.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-				link(textShapePostConditionMod, childStatement.getPostCondition());
->>>>>>> master
-
-				// vertical lines, that need to be added, when ExtraSelection is used:
-				Shape ver1Shape = peCreateService.createShape((ContainerShape) context.getPictogramElement(), false);
-				Polyline ver1line = Graphiti.getGaService().createPolyline(ver1Shape);
-				setId(ver1line, ID_VER1_LINE);
-				setIndex(ver1line, newIndex);
-
-				Shape ver2Shape = peCreateService.createShape((ContainerShape) context.getPictogramElement(), false);
-				Polyline ver2line = Graphiti.getGaService().createPolyline(ver2Shape);
-				setId(ver2line, ID_VER2_LINE);
-				setIndex(ver2line, newIndex);
-
-				Shape ver3Shape = peCreateService.createShape((ContainerShape) context.getPictogramElement(), false);
-				Polyline ver3line = Graphiti.getGaService().createPolyline(ver3Shape);
-				setId(ver3line, ID_VER3_LINE);
-				setIndex(ver3line, newIndex);
-
-				EList<Condition> childConditions = ((SelectionStatement) context.getDomainObject()).getGuards();
-				Condition childCondition = childConditions.get(newIndex);
-
-				Shape shapeTextCond = Graphiti.getPeCreateService()
-						.createShape((ContainerShape) context.getPictogramElement(), true);
-				MultiText conditionNameText = Graphiti.getGaService().createMultiText(shapeTextCond,
-						childCondition.getName());
-				setId(conditionNameText, ID_CONDITION_TEXT);
-				setIndex(conditionNameText, newIndex);
-				conditionNameText.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-				conditionNameText.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-				link(shapeTextCond, childCondition);
-			}
-			RoundedRectangle rectangle = (RoundedRectangle) context.getGraphicsAlgorithm();
-			if (checkIsProven(statement)) {
-				statement.setProven(true);
-				rectangle.setForeground(manageColor(IColorConstant.DARK_GREEN));
-				updateParent(statement);
-<<<<<<< HEAD
-			} else {
-				statement.setProven(false);
-=======
-			} else if (statement.isTested()) {
-				statement.setTested(true);
-				rectangle.setForeground(manageColor(IColorConstant.LIGHT_ORANGE));
-				updateParent(statement);
-			} else {
-				statement.setProven(false);
-				statement.setTested(false);
->>>>>>> master
-				rectangle.setForeground(manageColor(IColorConstant.RED));
-				updateParent(statement);
-			}
-			
-			// TODO: update parent may be redundant here
-			HighlightHelper.instance.handleHighlightDrawing(context, rectangle);
-			
-			updateParent(statement);
-			return true;
-		} else if (id.equals(ID_IMAGE_PROVEN)) {
-			SelectionStatement domainObject = (SelectionStatement) context.getDomainObject();
-			Image image = (Image) context.getGraphicsAlgorithm();
-			if (checkIsProven(domainObject)) {
-				image.setId(CbCImageProvider.IMG_PROVEN);
-			} else {
-				image.setId(CbCImageProvider.IMG_UNPROVEN);
-			}
-		}
-		return false;
-	}
-
-	private boolean checkIsProven(SelectionStatement statement) {
-		boolean isProven = statement.isPreProve();
-		for (AbstractStatement childStatement : statement.getCommands()) {
-			AbstractStatement statementToCheck = null;
-			if (childStatement.getRefinement() != null) {
-				statementToCheck = childStatement.getRefinement();
-			} else {
-				statementToCheck = childStatement;
-			}
-			if (!statementToCheck.isProven()) {
-				isProven = false;
-			}
-		}
-		return isProven;
-
-	}
-
-	private void updateParent(AbstractStatement statement) {
-		if (statement.getParent() != null) {
-			IPeService pe = Graphiti.getPeService();
-			EObject[] objArray = { statement.getParent() };
-			Object[] obj = pe.getLinkedPictogramElements(objArray, getDiagram());
-			if (obj.length > 0) {
-				Shape pElement = (Shape) obj[0];
-				if (pElement.getContainer() != null)
-					updatePictogramElement(pElement.getContainer());
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/SkipStatementPattern.java.orig b/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/SkipStatementPattern.java.orig
deleted file mode 100644
index 30f74da64..000000000
--- a/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/SkipStatementPattern.java.orig
+++ /dev/null
@@ -1,476 +0,0 @@
-package de.tu_bs.cs.isf.cbc.tool.patterns;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.graphiti.features.IReason;
-import org.eclipse.graphiti.features.context.IAddContext;
-import org.eclipse.graphiti.features.context.ICreateContext;
-import org.eclipse.graphiti.features.impl.Reason;
-import org.eclipse.graphiti.mm.algorithms.GraphicsAlgorithm;
-import org.eclipse.graphiti.mm.algorithms.Image;
-import org.eclipse.graphiti.mm.algorithms.MultiText;
-import org.eclipse.graphiti.mm.algorithms.Polyline;
-import org.eclipse.graphiti.mm.algorithms.RoundedRectangle;
-import org.eclipse.graphiti.mm.algorithms.Text;
-import org.eclipse.graphiti.mm.algorithms.styles.Font;
-import org.eclipse.graphiti.mm.algorithms.styles.Orientation;
-import org.eclipse.graphiti.mm.algorithms.styles.Point;
-import org.eclipse.graphiti.mm.pictograms.ContainerShape;
-import org.eclipse.graphiti.mm.pictograms.Diagram;
-import org.eclipse.graphiti.mm.pictograms.PictogramElement;
-import org.eclipse.graphiti.mm.pictograms.Shape;
-import org.eclipse.graphiti.pattern.IPattern;
-import org.eclipse.graphiti.pattern.id.IdLayoutContext;
-import org.eclipse.graphiti.pattern.id.IdPattern;
-import org.eclipse.graphiti.pattern.id.IdUpdateContext;
-import org.eclipse.graphiti.services.Graphiti;
-import org.eclipse.graphiti.services.IGaService;
-import org.eclipse.graphiti.services.IPeCreateService;
-import org.eclipse.graphiti.services.IPeService;
-import org.eclipse.graphiti.util.IColorConstant;
-import org.eclipse.graphiti.util.PredefinedColoredAreas;
-
-import de.tu_bs.cs.isf.cbc.cbcmodel.AbstractStatement;
-import de.tu_bs.cs.isf.cbc.cbcmodel.CbcmodelFactory;
-import de.tu_bs.cs.isf.cbc.cbcmodel.Condition;
-import de.tu_bs.cs.isf.cbc.cbcmodel.SkipStatement;
-import de.tu_bs.cs.isf.cbc.tool.diagram.CbCImageProvider;
-import de.tu_bs.cs.isf.cbc.tool.helper.HighlightHelper;
-
-/**
- * Class that creates the graphical representation of Conditions
- * @author Tobias
- *
- */
-public class SkipStatementPattern extends IdPattern implements IPattern {
-
-	private static final String ID_NAME_TEXT = "statementNameText";
-	private static final String ID_MAIN_RECTANGLE = "mainRectangle";
-<<<<<<< HEAD
-	private static final String ID_PRE_TEXT = "preNameText";
-	private static final String ID_POST_TEXT = "postNameText";
-=======
-	private static final String ID_PRE_TEXT = "preText";
-	private static final String ID_PRE_MOD = "preConditionModifiables";
-	private static final String ID_POST_TEXT = "postText";
-	private static final String ID_POST_MOD = "postConditionModifiables";
->>>>>>> master
-	private static final String ID_IMAGE_PROVEN = "imageproven";
-	//Headers:
-	private static final String ID_PRE_HEADER = "preHeader";
-	private static final String ID_POST_HEADER = "postHeader";
-	//lines:
-	private static final String ID_SEP_LEFT = "sepLeft";
-	private static final String ID_SEP_RIGHT = "sepRight";
-	private static final String ID_SEP_HEADER1 = "sepHeader1";
-	private static final String ID_SEP_HEADER2 = "sepHeader";
-<<<<<<< HEAD
-=======
-	private static final String ID_HOR1_LINE = "hor1Line";
-	private static final String ID_HOR2_LINE = "hor2Line";
->>>>>>> master
-
-
-	/**
-	 * Constructor of the class
-	 */
-	public SkipStatementPattern() {
-		super();
-	}
-	
-	@Override
-	public String getCreateName() {
-		return "SkipStatement";
-	}
-	
-	@Override
-	public String getCreateDescription() {
-		return "Create a SkipStatement.";
-	}
-
-	@Override
-	public boolean isMainBusinessObjectApplicable(Object mainBusinessObject) {
-		return mainBusinessObject instanceof SkipStatement;
-	}
-
-	@Override
-	public boolean canCreate(ICreateContext context) {
-		return context.getTargetContainer() instanceof Diagram;
-	}
-	
-	@Override
-	public Object[] create(ICreateContext context) {
-		SkipStatement statement = CbcmodelFactory.eINSTANCE.createSkipStatement();
-		statement.setName(";");
-		Condition pre = CbcmodelFactory.eINSTANCE.createCondition();
-		pre.setName("");
-		statement.setPreCondition(pre);
-		Condition post = CbcmodelFactory.eINSTANCE.createCondition();
-		post.setName("");
-		statement.setPostCondition(post);
-		
-		addGraphicalRepresentation(context, statement);
-		return new Object[] { statement };
-	}
-
-	@Override
-	public boolean canAdd(IAddContext context) {
-		return super.canAdd(context) && context.getTargetContainer() instanceof Diagram;
-	}
-
-	@Override
-	public PictogramElement doAdd(IAddContext context) {
-		manageColor(IColorConstant.DARK_GREEN);
-<<<<<<< HEAD
-=======
-		manageColor(IColorConstant.LIGHT_ORANGE);
->>>>>>> master
-		Diagram targetDiagram = (Diagram) context.getTargetContainer();
-		SkipStatement addedStatement = (SkipStatement) context.getNewObject();
-		IPeCreateService peCreateService = Graphiti.getPeCreateService();
-		IGaService gaService = Graphiti.getGaService();
-
-<<<<<<< HEAD
-		int width = context.getWidth() <= 0 ? 300 : context.getWidth();
-        int height = context.getHeight() <= 0 ? 150 : context.getHeight();
-=======
-		int width = context.getWidth() <= 0 ? 350 : context.getWidth();
-        int height = context.getHeight() <= 0 ? 200 : context.getHeight();
->>>>>>> master
-        
-        //Font for the Header:
-        Font headerFont = gaService.manageFont(getDiagram(), "Arial", 9, false, true);
-        
-		// Main contents area
-		ContainerShape outerContainerShape = peCreateService.createContainerShape(targetDiagram, true);
-		RoundedRectangle mainRectangle = gaService.createRoundedRectangle(outerContainerShape, 20, 20);
-		mainRectangle.setFilled(true);
-		gaService.setRenderingStyle(mainRectangle, PredefinedColoredAreas.getBlueWhiteAdaptions());
-		mainRectangle.setForeground(manageColor(IColorConstant.RED));
-		mainRectangle.setLineWidth(2);
-		setId(mainRectangle, ID_MAIN_RECTANGLE);
-		gaService.setLocationAndSize(mainRectangle,
-	            context.getX(), context.getY(), width, height);
-
-        // create link and wire it
-        link(outerContainerShape, addedStatement);
-
-		// Statement name
-		Shape textShape = peCreateService.createShape(outerContainerShape, false);
-		MultiText statementNameText = gaService.createMultiText(textShape, "");
-		setId(statementNameText, ID_NAME_TEXT);
-		statementNameText.setValue("Skip");
-		statementNameText.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		statementNameText.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		statementNameText.setFont(headerFont);
-		
-		Shape preShape = peCreateService.createShape(outerContainerShape, false);
-<<<<<<< HEAD
-		MultiText preNameText = gaService.createMultiText(preShape, "{" + addedStatement.getPreCondition().getName() + "}");
-=======
-		MultiText preNameText = gaService.createMultiText(preShape,
-				"{" + addedStatement.getPreCondition().getName() + "}");
->>>>>>> master
-		setId(preNameText, ID_PRE_TEXT);
-		preNameText.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		preNameText.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		
-<<<<<<< HEAD
-		Shape postShape = peCreateService.createShape(outerContainerShape, false);
-		MultiText postNameText = gaService.createMultiText(postShape, "{" + addedStatement.getPostCondition().getName() + "}");
-		setId(postNameText, ID_POST_TEXT);
-		postNameText.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		postNameText.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-=======
-		Shape textShapePreConditionMod = peCreateService.createShape(outerContainerShape, true);
-		MultiText preConditionTextMod = gaService.createMultiText(textShapePreConditionMod, "");
-		setId(preConditionTextMod, ID_PRE_MOD);
-		String modString = "";
-		for (String s : addedStatement.getPreCondition().getModifiables()) {
-			modString += s + ", ";
-		}
-		preConditionTextMod.setValue("modifiable(" + (modString.equals("") ? "" : modString.substring(0, modString.length() - 2)) + ");");
-		preConditionTextMod.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		preConditionTextMod.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-
-		Shape postShape = peCreateService.createShape(outerContainerShape, false);
-		MultiText postNameText = gaService.createMultiText(postShape,
-				"{" + addedStatement.getPostCondition().getName() + "}");
-		setId(postNameText, ID_POST_TEXT);
-		postNameText.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		postNameText.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		
-		Shape textShapePostConditionMod = peCreateService.createShape(outerContainerShape, true);
-		MultiText postConditionTextMod = gaService.createMultiText(textShapePostConditionMod, "");
-		setId(postConditionTextMod, ID_POST_MOD);
-		modString = "";
-		for (String s : addedStatement.getPostCondition().getModifiables()) {
-			modString += s + ", ";
-		}
-		postConditionTextMod.setValue("modifiable(" + (modString.equals("") ? "" : modString.substring(0, modString.length() - 2)) + ");");
-		postConditionTextMod.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		postConditionTextMod.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
->>>>>>> master
-
-		Shape proveShape = peCreateService.createShape(outerContainerShape, false);
-		Image image = gaService.createImage(proveShape, CbCImageProvider.IMG_UNPROVEN);
-		setId(image, ID_IMAGE_PROVEN);
-		
-		//Header: 
-		Shape postHeader = peCreateService.createShape(outerContainerShape, false);
-		Text postNameHeader = gaService.createText(postHeader, "postcondition");
-		setId(postNameHeader, ID_POST_HEADER);
-		postNameHeader.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		postNameHeader.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		postNameHeader.setFont(headerFont);
-		
-		Shape preHeader = peCreateService.createShape(outerContainerShape, false);
-		Text preNameHeader = gaService.createText(preHeader, "precondition");
-		setId(preNameHeader, ID_PRE_HEADER);
-		preNameHeader.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		preNameHeader.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		preNameHeader.setFont(headerFont);	
-		//lines:
-		Shape leftSepShape = peCreateService.createShape(outerContainerShape, false);
-		Polyline polylineLeft = gaService.createPolyline(leftSepShape);
-		setId(polylineLeft, ID_SEP_LEFT);
-		
-		Shape rightSepShape = peCreateService.createShape(outerContainerShape, false);
-		Polyline polylineRight = gaService.createPolyline(rightSepShape);
-		setId(polylineRight, ID_SEP_RIGHT);
-		
-		Shape header1SepShape = peCreateService.createShape(outerContainerShape, false);
-		Polyline header1line = gaService.createPolyline(header1SepShape);
-		setId(header1line, ID_SEP_HEADER1);
-		
-		Shape header2SepShape = peCreateService.createShape(outerContainerShape, false);
-		Polyline header2line = gaService.createPolyline(header2SepShape);
-		setId(header2line, ID_SEP_HEADER2);
-<<<<<<< HEAD
-=======
-		
-		Shape hor1LineShape = peCreateService.createShape(outerContainerShape, false);
-		Polyline hor1Polyline = gaService.createPolyline(hor1LineShape);
-		setId(hor1Polyline, ID_HOR1_LINE);
-
-		Shape hor2LineShape = peCreateService.createShape(outerContainerShape, false);
-		Polyline hor2Polyline = gaService.createPolyline(hor2LineShape);
-		setId(hor2Polyline, ID_HOR2_LINE);
->>>>>>> master
-				
-		peCreateService.createChopboxAnchor(outerContainerShape);
-
-		link(outerContainerShape, addedStatement);
-		link(textShape, addedStatement);
-		link(preShape, addedStatement.getPreCondition());
-<<<<<<< HEAD
-		link(postShape, addedStatement.getPostCondition());
-=======
-		link(textShapePreConditionMod, addedStatement.getPreCondition());
-		link(postShape, addedStatement.getPostCondition());
-		link(textShapePostConditionMod, addedStatement.getPostCondition());
->>>>>>> master
-		link(proveShape, addedStatement);
-
-		return outerContainerShape;
-	}
-
-	@Override
-	protected boolean layout(IdLayoutContext context, String id) {
-		boolean changesDone = false;
-		
-		GraphicsAlgorithm mainRectangle = context.getRootPictogramElement().getGraphicsAlgorithm();
-		GraphicsAlgorithm ga = context.getGraphicsAlgorithm();
-		int halfWidth = mainRectangle.getWidth() / 2;
-		//stable sizes from Name and Header save space when the diagram gets big!
-<<<<<<< HEAD
-		int sizeName = 30; //size from Name block
-		int sizeHeader = 20; //size from the Header
-		int positionHeader = 40; //position where the Header is
-		int sizeText = mainRectangle.getHeight() - positionHeader - sizeName;  //size from the blocks (pre, statement, post)
-		int positionText = positionHeader + sizeName; //position from the blocks (pre, statement, post)
-=======
-		int sizeName = 40; //size from Name block
-		int sizeHeader = 20; //size from the Header
-		int positionHeader = 40; //position where the Header is
-		int positionText = positionHeader + sizeHeader; //position from the blocks (pre, statement, post)
-		int thirdBlockHeight = (mainRectangle.getHeight()-positionHeader-sizeHeader)/3;
->>>>>>> master
-		
-		if (id.equals(ID_NAME_TEXT)) {
-			Graphiti.getGaService().setLocationAndSize(ga, 0, 0, mainRectangle.getWidth(), sizeName);
-			changesDone = true;
-		} else if (id.equals(ID_PRE_TEXT)) {
-<<<<<<< HEAD
-			Graphiti.getGaService().setLocationAndSize(ga, 0, positionText, halfWidth, sizeText);
-			changesDone = true;
-		} else if (id.equals(ID_POST_TEXT)) {
-			Graphiti.getGaService().setLocationAndSize(ga, halfWidth, positionText, halfWidth, sizeText);
-=======
-			Graphiti.getGaService().setLocationAndSize(ga, 0, positionText+thirdBlockHeight, halfWidth, thirdBlockHeight*2);
-			changesDone = true;
-		} else if (id.equals(ID_PRE_MOD)) {
-			Graphiti.getGaService().setLocationAndSize(ga, 0, positionText, halfWidth, thirdBlockHeight);
-			changesDone = true;
-		} else if (id.equals(ID_POST_TEXT)) {
-			Graphiti.getGaService().setLocationAndSize(ga, halfWidth, positionText+thirdBlockHeight, halfWidth, thirdBlockHeight*2);
-			changesDone = true;
-		} else if (id.equals(ID_POST_MOD)) {
-			Graphiti.getGaService().setLocationAndSize(ga, halfWidth, positionText, halfWidth, thirdBlockHeight);
->>>>>>> master
-			changesDone = true;
-		} else if (id.equals(ID_IMAGE_PROVEN)) {
-			Graphiti.getGaService().setLocationAndSize(ga, mainRectangle.getWidth() - 20, 10, 10, 10);
-			changesDone = true;
-		} else if (id.equals(ID_PRE_HEADER)) {
-			Graphiti.getGaService().setLocationAndSize(ga, 0, positionHeader, halfWidth, sizeHeader);
-			changesDone = true;
-		} else if (id.equals(ID_POST_HEADER)) {
-			Graphiti.getGaService().setLocationAndSize(ga, halfWidth, positionHeader, halfWidth, sizeHeader);
-			changesDone = true;
-		} else if (id.equals(ID_SEP_HEADER1)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService().createPointList(
-					new int[] { 0, positionHeader, mainRectangle.getWidth(), positionHeader });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		} else if (id.equals(ID_SEP_HEADER2)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService().createPointList(
-					new int[] { 0, positionHeader + sizeHeader, mainRectangle.getWidth(), positionHeader + sizeHeader });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		} else if (id.equals(ID_SEP_LEFT)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService().createPointList(
-					new int[] { halfWidth, positionHeader, halfWidth, mainRectangle.getHeight() });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-<<<<<<< HEAD
-=======
-		} else if (id.equals(ID_HOR1_LINE)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService().createPointList(
-					new int[] { 0, positionText+thirdBlockHeight, halfWidth, positionText+thirdBlockHeight });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
->>>>>>> master
-		} else if (id.equals(ID_SEP_RIGHT)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService().createPointList(
-					new int[] { halfWidth * 2, positionHeader, halfWidth * 2, mainRectangle.getHeight() });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-<<<<<<< HEAD
-		}
-=======
-		} else if (id.equals(ID_HOR2_LINE)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService().createPointList(
-					new int[] { halfWidth, positionText+thirdBlockHeight, mainRectangle.getWidth(), positionText+thirdBlockHeight });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		} 
->>>>>>> master
-
-		return changesDone;
-	}
-
-	@Override
-	protected IReason updateNeeded(IdUpdateContext context, String id) {
-		if (id.equals(ID_MAIN_RECTANGLE)) {
-			RoundedRectangle rectangle = (RoundedRectangle) context.getGraphicsAlgorithm();
-			AbstractStatement domainObject = (AbstractStatement) context.getDomainObject();
-			if (domainObject.isProven() && 
-					((rectangle.getForeground() != null && !rectangle.getForeground().equals(manageColor(IColorConstant.DARK_GREEN))) 
-							|| rectangle.getForeground() == null)) {
-				return Reason.createTrueReason("Statement is proven. Expected green color.");
-<<<<<<< HEAD
-			} else if (!domainObject.isProven() && 
-					((rectangle.getForeground() != null && rectangle.getForeground().equals(manageColor(IColorConstant.DARK_GREEN))) 
-							|| rectangle.getForeground() == null)) {
-				return Reason.createTrueReason("Statement is not proven. Expected red color.");
-			} 
-=======
-			} else if (!domainObject.isProven() && domainObject.isTested() &&
-					((rectangle.getForeground() != null && !rectangle.getForeground().equals(manageColor(IColorConstant.LIGHT_ORANGE))) 
-							|| rectangle.getForeground() == null)) {
-				return Reason.createTrueReason("Statement is tested. Expected orange color.");
-			} else if (!domainObject.isProven() && !domainObject.isTested() && 
-					((rectangle.getForeground() != null && (rectangle.getForeground().equals(manageColor(IColorConstant.DARK_GREEN)) || rectangle.getForeground().equals(manageColor(IColorConstant.LIGHT_ORANGE)))) 
-							|| rectangle.getForeground() == null)) {
-				return Reason.createTrueReason("Statement is not proven. Expected red color.");
-			}  
->>>>>>> master
-		} else if (id.equals(ID_IMAGE_PROVEN)) {
-			AbstractStatement domainObject = (AbstractStatement) context.getDomainObject();
-			 Image image = (Image) context.getGraphicsAlgorithm();
-			if (domainObject.isProven() && image.getId().equals(CbCImageProvider.IMG_UNPROVEN)) {
-				return Reason.createTrueReason("Statement is proven. Expected green color.");
-			} else if (!domainObject.isProven() && image.getId().equals(CbCImageProvider.IMG_PROVEN)) {
-				return Reason.createTrueReason("Statement is not proven. Expected red color.");
-			} 
-		}
-		if(HighlightHelper.instance.needsInitialHighlightUpdate(context)) {
-			return Reason.createTrueReason("Element needs to be highlighted.");
-		}
-		return Reason.createFalseReason();
-	}
-
-	@Override
-	protected boolean update(IdUpdateContext context, String id) {
-		if (id.equals(ID_MAIN_RECTANGLE)) {
-			RoundedRectangle rectangle = (RoundedRectangle) context.getGraphicsAlgorithm();
-			AbstractStatement domainObject = (AbstractStatement) context.getDomainObject();
-			if (domainObject.isProven()) {
-				rectangle.setForeground(manageColor(IColorConstant.DARK_GREEN));
-				if(domainObject.getParent()!= null) {
-					IPeService pe = Graphiti.getPeService();
-					EObject[] objArray = {domainObject.getParent()};
-					Object[] obj =  pe.getLinkedPictogramElements(objArray, getDiagram());
-					Shape pElement = (Shape) obj[0];
-					if (pElement.getContainer() != null) updatePictogramElement(pElement.getContainer());
-				}
-<<<<<<< HEAD
-=======
-			} else if (domainObject.isTested()) {
-				rectangle.setForeground(manageColor(IColorConstant.LIGHT_ORANGE));
-				if(domainObject.getParent()!= null) {
-					IPeService pe = Graphiti.getPeService();
-					EObject[] objArray = {domainObject.getParent()};
-					Object[] obj =  pe.getLinkedPictogramElements(objArray, getDiagram());
-					Shape pElement = (Shape) obj[0];
-					if (pElement.getContainer() != null) updatePictogramElement(pElement.getContainer());
-				}	
->>>>>>> master
-			} else {
-				rectangle.setForeground(manageColor(IColorConstant.RED));
-				if(domainObject.getParent()!= null) {
-					IPeService pe = Graphiti.getPeService();
-					EObject[] objArray = {domainObject.getParent()};
-					Object[] obj =  pe.getLinkedPictogramElements(objArray, getDiagram());
-					Shape pElement = (Shape) obj[0];
-					if (pElement.getContainer() != null) updatePictogramElement(pElement.getContainer());
-				}
-			}
-			HighlightHelper.instance.handleHighlightDrawing(context, rectangle);
-			return true;
-		} else if (id.equals(ID_IMAGE_PROVEN)) {
-			AbstractStatement domainObject = (AbstractStatement) context.getDomainObject();
-			 Image image = (Image) context.getGraphicsAlgorithm();
-			if (domainObject.isProven()) {
-				image.setId(CbCImageProvider.IMG_PROVEN);
-			} else {
-				image.setId(CbCImageProvider.IMG_UNPROVEN);
-			} 
-		}
-		return false;
-	}
-}
diff --git a/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/SmallRepetitionPattern.java.orig b/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/SmallRepetitionPattern.java.orig
deleted file mode 100644
index 833dae09d..000000000
--- a/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/SmallRepetitionPattern.java.orig
+++ /dev/null
@@ -1,650 +0,0 @@
-package de.tu_bs.cs.isf.cbc.tool.patterns;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.graphiti.features.IReason;
-import org.eclipse.graphiti.features.context.IAddContext;
-import org.eclipse.graphiti.features.context.ICreateContext;
-import org.eclipse.graphiti.features.impl.Reason;
-import org.eclipse.graphiti.mm.algorithms.GraphicsAlgorithm;
-import org.eclipse.graphiti.mm.algorithms.Image;
-import org.eclipse.graphiti.mm.algorithms.MultiText;
-import org.eclipse.graphiti.mm.algorithms.Polyline;
-import org.eclipse.graphiti.mm.algorithms.RoundedRectangle;
-import org.eclipse.graphiti.mm.algorithms.Text;
-import org.eclipse.graphiti.mm.algorithms.styles.Font;
-import org.eclipse.graphiti.mm.algorithms.styles.Orientation;
-import org.eclipse.graphiti.mm.algorithms.styles.Point;
-import org.eclipse.graphiti.mm.pictograms.ContainerShape;
-import org.eclipse.graphiti.mm.pictograms.Diagram;
-import org.eclipse.graphiti.mm.pictograms.PictogramElement;
-import org.eclipse.graphiti.mm.pictograms.Shape;
-import org.eclipse.graphiti.pattern.IPattern;
-import org.eclipse.graphiti.pattern.id.IdLayoutContext;
-import org.eclipse.graphiti.pattern.id.IdPattern;
-import org.eclipse.graphiti.pattern.id.IdUpdateContext;
-import org.eclipse.graphiti.services.Graphiti;
-import org.eclipse.graphiti.services.IGaService;
-import org.eclipse.graphiti.services.IPeCreateService;
-import org.eclipse.graphiti.services.IPeService;
-import org.eclipse.graphiti.util.IColorConstant;
-import org.eclipse.graphiti.util.PredefinedColoredAreas;
-
-import de.tu_bs.cs.isf.cbc.cbcmodel.AbstractStatement;
-import de.tu_bs.cs.isf.cbc.cbcmodel.CbcmodelFactory;
-import de.tu_bs.cs.isf.cbc.cbcmodel.Condition;
-import de.tu_bs.cs.isf.cbc.cbcmodel.SmallRepetitionStatement;
-import de.tu_bs.cs.isf.cbc.cbcmodel.Variant;
-import de.tu_bs.cs.isf.cbc.tool.diagram.CbCImageProvider;
-import de.tu_bs.cs.isf.cbc.tool.helper.HighlightHelper;
-
-/**
- * Class that creates the graphical representation of Conditions
- * @author Tobias
- *
- */
-public class SmallRepetitionPattern extends IdPattern implements IPattern {
-
-	private static final String ID_STATEMENT_TEXT = "statementRepNameText";
-	private static final String ID_CONDITION_TEXT = "conditionRepText";
-	private static final String ID_VARIANT_TEXT = "variantRepText";
-	private static final String ID_INVARIANT_TEXT = "invariantRepText";
-	private static final String ID_MAIN_RECTANGLE = "mainRectangle";
-	private static final String ID_NAME_TEXT = "nameText";
-	private static final String ID_PRE_TEXT = "preNameText";
-<<<<<<< HEAD
-	private static final String ID_POST_TEXT = "postNameText";
-=======
-	private static final String ID_PRE_MOD = "preConditionModifiables";
-	private static final String ID_POST_TEXT = "postNameText";
-	private static final String ID_POST_MOD = "postConditionModifiables";
->>>>>>> master
-	private static final String ID_IMAGE_PROVEN = "imageproven";
-	//Headers:
-	private static final String ID_VARIANT_HEADER = "variantHeader";
-	private static final String ID_INVARIANT_HEADER = "invariantHeader";
-	private static final String ID_GUARD_HEADER = "guardHeader";
-	private static final String ID_LOOP_HEADER = "loopHeader";
-	private static final String ID_PRE_HEADER = "preHeader";
-	private static final String ID_POST_HEADER = "postHeader";
-	//lines:
-	private static final String ID_HOR1_SEP = "hor1SEP"; // HOR = horizontal
-	private static final String ID_HOR2_SEP = "hor2SEP";
-	private static final String ID_HOR3_SEP = "hor3SEP";
-	private static final String ID_HOR4_SEP = "hor4SEP";
-<<<<<<< HEAD
-=======
-	private static final String ID_HOR5_SEP = "hor5SEP";
-	private static final String ID_HOR6_SEP = "hor6SEP";
->>>>>>> master
-	private static final String ID_VER1_SEP = "ver1SEP"; //VER = vertical
-	private static final String ID_VER2_SEP = "ver2SEP";
-
-
-	/**
-	 * Constructor of the class
-	 */
-	public SmallRepetitionPattern() {
-		super();
-	}
-	
-	@Override
-	public String getCreateName() {
-<<<<<<< HEAD
-		return "SmallRepetitionStatement";
-=======
-		return "RepetitionStatement";
->>>>>>> master
-	}
-	
-	@Override
-	public String getCreateDescription() {
-<<<<<<< HEAD
-		return "Create a RepetitionStatement with only the loop statement.";
-=======
-		return "Create a RepetitionStatement with the loop statement.";
->>>>>>> master
-	}
-
-	@Override
-	public boolean isMainBusinessObjectApplicable(Object mainBusinessObject) {
-		return mainBusinessObject instanceof SmallRepetitionStatement;
-	}
-
-	@Override
-	public boolean canCreate(ICreateContext context) {
-		return context.getTargetContainer() instanceof Diagram;
-	}
-	
-	@Override
-	public Object[] create(ICreateContext context) {
-		SmallRepetitionStatement repetitionStatement = CbcmodelFactory.eINSTANCE.createSmallRepetitionStatement();
-		repetitionStatement.setName("repetitionStatement");
-		AbstractStatement statement = CbcmodelFactory.eINSTANCE.createAbstractStatement();
-		statement.setName("loop");
-		repetitionStatement.setLoopStatement(statement);
-		Condition condition = CbcmodelFactory.eINSTANCE.createCondition();
-		condition.setName("guard");
-		repetitionStatement.setGuard(condition);
-		Condition invariant = CbcmodelFactory.eINSTANCE.createCondition();
-		invariant.setName("invariant");
-		repetitionStatement.setInvariant(invariant);
-		Variant variant = CbcmodelFactory.eINSTANCE.createVariant();
-		variant.setName("variant");
-		repetitionStatement.setVariant(variant);
-		
-		Condition pre = CbcmodelFactory.eINSTANCE.createCondition();
-		pre.setName("");
-		statement.setPreCondition(pre);
-		Condition post = CbcmodelFactory.eINSTANCE.createCondition();
-		post.setName("");
-		statement.setPostCondition(post);
-		
-		Condition preRep = CbcmodelFactory.eINSTANCE.createCondition();
-		preRep.setName("");
-		repetitionStatement.setPreCondition(preRep);
-		Condition postRep = CbcmodelFactory.eINSTANCE.createCondition();
-		postRep.setName("");
-		repetitionStatement.setPostCondition(postRep);
-		
-		addGraphicalRepresentation(context, repetitionStatement);
-		return new Object[] { repetitionStatement };
-	}
-
-	@Override
-	public boolean canAdd(IAddContext context) {
-		return super.canAdd(context) && context.getTargetContainer() instanceof Diagram;
-	}
-
-	@Override
-	public PictogramElement doAdd(IAddContext context) {
-
-<<<<<<< HEAD
-manageColor(IColorConstant.DARK_GREEN);
-=======
-		manageColor(IColorConstant.DARK_GREEN);
-		manageColor(IColorConstant.LIGHT_ORANGE);
->>>>>>> master
-		Diagram targetDiagram = (Diagram) context.getTargetContainer();
-		SmallRepetitionStatement addedStatement = (SmallRepetitionStatement) context.getNewObject();
-		IPeCreateService peCreateService = Graphiti.getPeCreateService();
-		IGaService gaService = Graphiti.getGaService();
-
-<<<<<<< HEAD
-		int width = context.getWidth() <= 0 ? 300 : context.getWidth();
-        int height = context.getHeight() <= 0 ? 300 : context.getHeight();
-=======
-		int width = context.getWidth() <= 0 ? 450 : context.getWidth();
-        int height = context.getHeight() <= 0 ? 350 : context.getHeight();
->>>>>>> master
-        //Font:
-        Font headerFont = gaService.manageFont(getDiagram(), "Arial", 9, false, true);
-        
-		// Main contents area
-		ContainerShape outerContainerShape = peCreateService.createContainerShape(targetDiagram, true);
-		RoundedRectangle mainRectangle = gaService.createRoundedRectangle(outerContainerShape, 20, 20);
-		mainRectangle.setFilled(true);
-		gaService.setRenderingStyle(mainRectangle, PredefinedColoredAreas.getBlueWhiteAdaptions());
-		mainRectangle.setForeground(manageColor(IColorConstant.RED));
-		mainRectangle.setLineWidth(2);
-		setId(mainRectangle, ID_MAIN_RECTANGLE);
-		gaService.setLocationAndSize(mainRectangle,
-	            context.getX(), context.getY(), width, height);
-
-        // create link and wire it
-        link(outerContainerShape, addedStatement);
-
-		// Statement name
-        Shape textShapeStatement1 = peCreateService.createShape(outerContainerShape, true);
-		MultiText statement1Text = gaService.createMultiText(textShapeStatement1, "");
-		setId(statement1Text, ID_STATEMENT_TEXT);
-		statement1Text.setValue(addedStatement.getLoopStatement().getName());
-		statement1Text.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		statement1Text.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		
-		Shape textShapeCondition = peCreateService.createShape(outerContainerShape, true);
-		MultiText conditionText = gaService.createMultiText(textShapeCondition, "");
-		setId(conditionText, ID_CONDITION_TEXT);
-		conditionText.setValue(addedStatement.getGuard().getName());
-		conditionText.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		conditionText.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		
-		Shape textShapeInvariant = peCreateService.createShape(outerContainerShape, true);
-		MultiText invariantText = gaService.createMultiText(textShapeInvariant, "");
-		setId(invariantText, ID_INVARIANT_TEXT);
-		invariantText.setValue(addedStatement.getInvariant().getName());
-		invariantText.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		invariantText.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		
-		Shape textShapeVariant = peCreateService.createShape(outerContainerShape, true);
-		MultiText variantText = gaService.createMultiText(textShapeVariant, "");
-		setId(variantText, ID_VARIANT_TEXT);
-		variantText.setValue(addedStatement.getVariant().getName());
-		variantText.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		variantText.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		
-		Shape textShapeName = peCreateService.createShape(outerContainerShape, false);
-		MultiText nameText = gaService.createMultiText(textShapeName, "RepetitionStatement DO...OD");
-		setId(nameText, ID_NAME_TEXT);
-		nameText.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		nameText.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		nameText.setFont(headerFont);
-		
-		Shape pre1Shape = peCreateService.createShape(outerContainerShape, false);
-		MultiText pre1NameText = gaService.createMultiText(pre1Shape, "{" + addedStatement.getLoopStatement().getPreCondition().getName() + "}");
-		setId(pre1NameText, ID_PRE_TEXT);
-		pre1NameText.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		pre1NameText.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		
-<<<<<<< HEAD
-=======
-		Shape textShapePreConditionMod = peCreateService.createShape(outerContainerShape, true);
-		MultiText preConditionTextMod = gaService.createMultiText(textShapePreConditionMod, "");
-		setId(preConditionTextMod, ID_PRE_MOD);
-		String modString = "";
-		for (String s : addedStatement.getPreCondition().getModifiables()) {
-			modString += s + ", ";
-		}
-		preConditionTextMod.setValue("modifiable(" + (modString.equals("") ? "" : modString.substring(0, modString.length() - 2)) + ");");
-		preConditionTextMod.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		preConditionTextMod.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-
->>>>>>> master
-		Shape post1Shape = peCreateService.createShape(outerContainerShape, false);
-		MultiText post1NameText = gaService.createMultiText(post1Shape, "{" + addedStatement.getLoopStatement().getPostCondition().getName() + "}");
-		setId(post1NameText, ID_POST_TEXT);
-		post1NameText.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		post1NameText.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		
-<<<<<<< HEAD
-=======
-		Shape textShapePostConditionMod = peCreateService.createShape(outerContainerShape, true);
-		MultiText postConditionTextMod = gaService.createMultiText(textShapePostConditionMod, "");
-		setId(postConditionTextMod, ID_POST_MOD);
-		modString = "";
-		for (String s : addedStatement.getPostCondition().getModifiables()) {
-			modString += s + ", ";
-		}
-		postConditionTextMod.setValue("modifiable(" + (modString.equals("") ? "" : modString.substring(0, modString.length() - 2)) + ");");
-		postConditionTextMod.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		postConditionTextMod.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		
->>>>>>> master
-		Shape proveShape = peCreateService.createShape(outerContainerShape, false);
-		Image image = gaService.createImage(proveShape, CbCImageProvider.IMG_UNPROVEN);
-		setId(image, ID_IMAGE_PROVEN);
-		//HEADER:
-		Shape variantHeader = peCreateService.createShape(outerContainerShape, false);
-		Text variantNameHeader = gaService.createText(variantHeader, "variant");
-		setId(variantNameHeader, ID_VARIANT_HEADER);
-		variantNameHeader.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		variantNameHeader.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		variantNameHeader.setFont(headerFont);
-		
-		Shape invariantHeader = peCreateService.createShape(outerContainerShape, false);
-		Text invariantNameHeader = gaService.createText(invariantHeader, "invariant");
-		setId(invariantNameHeader, ID_INVARIANT_HEADER);
-		invariantNameHeader.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		invariantNameHeader.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		invariantNameHeader.setFont(headerFont);
-		
-		Shape guardHeader = peCreateService.createShape(outerContainerShape, false);
-		Text guardNameHeader = gaService.createText(guardHeader, "guard");
-		setId(guardNameHeader, ID_GUARD_HEADER);
-		guardNameHeader.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		guardNameHeader.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		guardNameHeader.setFont(headerFont);
-		
-		Shape loopHeader = peCreateService.createShape(outerContainerShape, false);
-		Text loopNameHeader = gaService.createText(loopHeader, "loop statement");
-		setId(loopNameHeader, ID_LOOP_HEADER);
-		loopNameHeader.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		loopNameHeader.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		loopNameHeader.setFont(headerFont);
-		
-		Shape postHeader = peCreateService.createShape(outerContainerShape, false);
-		Text postNameHeader = gaService.createText(postHeader, "postcondition");
-		setId(postNameHeader, ID_POST_HEADER);
-		postNameHeader.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		postNameHeader.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		postNameHeader.setFont(headerFont);
-		
-		Shape preHeader = peCreateService.createShape(outerContainerShape, false);
-		Text preNameHeader = gaService.createText(preHeader, "precondition");
-		setId(preNameHeader, ID_PRE_HEADER);
-		preNameHeader.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		preNameHeader.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		preNameHeader.setFont(headerFont);
-		//lines:
-		Shape ver1Shape = peCreateService.createShape(outerContainerShape, false);
-		Polyline ver1line = gaService.createPolyline(ver1Shape);
-		setId(ver1line, ID_VER1_SEP);
-		
-		Shape ver2Shape = peCreateService.createShape(outerContainerShape, false);
-		Polyline ver2line = gaService.createPolyline(ver2Shape);
-		setId(ver2line, ID_VER2_SEP);
-		
-		Shape hor1Shape = peCreateService.createShape(outerContainerShape, false);
-		Polyline hor1line = gaService.createPolyline(hor1Shape);
-		setId(hor1line, ID_HOR1_SEP);
-		
-		Shape hor2Shape = peCreateService.createShape(outerContainerShape, false);
-		Polyline hor2line = gaService.createPolyline(hor2Shape);
-		setId(hor2line, ID_HOR2_SEP);
-		
-		Shape hor3Shape = peCreateService.createShape(outerContainerShape, false);
-		Polyline hor3line = gaService.createPolyline(hor3Shape);
-		setId(hor3line, ID_HOR3_SEP);
-		
-		Shape hor4Shape = peCreateService.createShape(outerContainerShape, false);
-		Polyline hor4line = gaService.createPolyline(hor4Shape);
-		setId(hor4line, ID_HOR4_SEP);
-		
-<<<<<<< HEAD
-=======
-		Shape hor5Shape = peCreateService.createShape(outerContainerShape, false);
-		Polyline hor5line = gaService.createPolyline(hor5Shape);
-		setId(hor5line, ID_HOR5_SEP);
-		
-		Shape hor6Shape = peCreateService.createShape(outerContainerShape, false);
-		Polyline hor6line = gaService.createPolyline(hor6Shape);
-		setId(hor6line, ID_HOR6_SEP);
-		
->>>>>>> master
-		peCreateService.createChopboxAnchor(textShapeStatement1);
-		peCreateService.createChopboxAnchor(outerContainerShape);
-
-		link(outerContainerShape, addedStatement);
-		link(textShapeCondition, addedStatement.getGuard());
-		link(textShapeStatement1, addedStatement.getLoopStatement());
-		link(textShapeVariant, addedStatement.getVariant());
-		link(textShapeInvariant, addedStatement.getInvariant());
-		link(pre1Shape, addedStatement.getLoopStatement().getPreCondition());
-<<<<<<< HEAD
-		link(post1Shape, addedStatement.getLoopStatement().getPostCondition());
-=======
-		link(textShapePreConditionMod, addedStatement.getPreCondition());
-		link(post1Shape, addedStatement.getLoopStatement().getPostCondition());
-		link(textShapePostConditionMod, addedStatement.getLoopStatement().getPostCondition());
->>>>>>> master
-		link(proveShape, addedStatement);
-
-		return outerContainerShape;
-	}
-
-	@Override
-	protected boolean layout(IdLayoutContext context, String id) {
-		boolean changesDone = false;
-		
-		GraphicsAlgorithm mainRectangle = context.getRootPictogramElement().getGraphicsAlgorithm();
-		GraphicsAlgorithm ga = context.getGraphicsAlgorithm();
-		int thirdWidth = mainRectangle.getWidth() / 3;
-<<<<<<< HEAD
-		int sizeName = 60;
-		int sizeHeader = 20;
-		int sizeBlock = (mainRectangle.getHeight() - sizeName) / 2 - sizeHeader;
-		int positionFirstLine = mainRectangle.getHeight() - (mainRectangle.getHeight() - sizeName ) + 20; // +20 for some space between Name and Header
-		int positionSecondLine = mainRectangle.getHeight() - (mainRectangle.getHeight() - sizeName ) / 2 + 20;
-=======
-		int sizeName = 40;
-		int sizeHeader = 20;
-		int sizeBlockUpper = ((mainRectangle.getHeight() - sizeName) / 3) - sizeHeader;
-		int sizeBlockLower = ((mainRectangle.getHeight() - sizeName) / 3) * 2 - sizeHeader;
-		int positionFirstLine = mainRectangle.getHeight() - (mainRectangle.getHeight() - sizeName ) + 20; // +20 for some space between Name and Header
-		int positionSecondLine = mainRectangle.getHeight() - ((mainRectangle.getHeight() - sizeName ) / 3) * 2 + 20;
->>>>>>> master
-		
-		if (id.equals(ID_NAME_TEXT)) {
-			Graphiti.getGaService().setLocationAndSize(ga, 0, 0, mainRectangle.getWidth(), sizeName);
-			changesDone = true;
-		} else if (id.equals(ID_INVARIANT_TEXT)) {
-<<<<<<< HEAD
-			Graphiti.getGaService().setLocationAndSize(ga, 0, positionFirstLine, thirdWidth, sizeBlock);
-			changesDone = true;
-		} else if (id.equals(ID_CONDITION_TEXT)) {
-			Graphiti.getGaService().setLocationAndSize(ga, thirdWidth, positionFirstLine, thirdWidth, sizeBlock);
-			changesDone = true;
-		} else if (id.equals(ID_VARIANT_TEXT)) {
-			Graphiti.getGaService().setLocationAndSize(ga, thirdWidth * 2, positionFirstLine, thirdWidth, sizeBlock);
-			changesDone = true;
-		} else if (id.equals(ID_STATEMENT_TEXT)) {
-			Graphiti.getGaService().setLocationAndSize(ga, thirdWidth, positionSecondLine, thirdWidth, sizeBlock);
-			changesDone = true;
-		} else if (id.equals(ID_PRE_TEXT)) {
-			Graphiti.getGaService().setLocationAndSize(ga, 0, positionSecondLine, thirdWidth, sizeBlock);
-			changesDone = true;
-		} else if (id.equals(ID_POST_TEXT)) {
-			Graphiti.getGaService().setLocationAndSize(ga, thirdWidth * 2, positionSecondLine, thirdWidth, sizeBlock);
-=======
-			Graphiti.getGaService().setLocationAndSize(ga, 0, positionFirstLine, thirdWidth, sizeBlockUpper);
-			changesDone = true;
-		} else if (id.equals(ID_CONDITION_TEXT)) {
-			Graphiti.getGaService().setLocationAndSize(ga, thirdWidth, positionFirstLine, thirdWidth, sizeBlockUpper);
-			changesDone = true;
-		} else if (id.equals(ID_VARIANT_TEXT)) {
-			Graphiti.getGaService().setLocationAndSize(ga, thirdWidth * 2, positionFirstLine, thirdWidth, sizeBlockUpper);
-			changesDone = true;
-		} else if (id.equals(ID_STATEMENT_TEXT)) {
-			Graphiti.getGaService().setLocationAndSize(ga, thirdWidth, positionSecondLine, thirdWidth, sizeBlockLower);
-			changesDone = true;
-		} else if (id.equals(ID_PRE_TEXT)) {
-			Graphiti.getGaService().setLocationAndSize(ga, 0, positionSecondLine + sizeBlockLower/3, thirdWidth, (sizeBlockLower/3)*2);
-			changesDone = true;
-		} else if (id.equals(ID_PRE_MOD)) {
-			Graphiti.getGaService().setLocationAndSize(ga, 0, positionSecondLine, thirdWidth, sizeBlockLower/3);
-			changesDone = true;
-		} else if (id.equals(ID_POST_TEXT)) {
-			Graphiti.getGaService().setLocationAndSize(ga, thirdWidth * 2, positionSecondLine + sizeBlockLower/3, thirdWidth, (sizeBlockLower/3)*2);
-			changesDone = true;
-		} else if (id.equals(ID_POST_MOD)) {
-			Graphiti.getGaService().setLocationAndSize(ga, thirdWidth * 2, positionSecondLine, thirdWidth, sizeBlockLower/3);
->>>>>>> master
-			changesDone = true;
-		} else if (id.equals(ID_IMAGE_PROVEN)) {
-			Graphiti.getGaService().setLocationAndSize(ga, mainRectangle.getWidth() - 20, 10, 10, 10);
-			changesDone = true;
-		//HEADERS:
-		} else if (id.equals(ID_VARIANT_HEADER)) {
-			Graphiti.getGaService().setLocationAndSize(ga, thirdWidth * 2, positionFirstLine - sizeHeader, thirdWidth, sizeHeader);
-			changesDone = true;
-		} else if (id.equals(ID_INVARIANT_HEADER)) {
-			Graphiti.getGaService().setLocationAndSize(ga, 0, positionFirstLine - sizeHeader, thirdWidth, sizeHeader);
-			changesDone = true;
-		} else if (id.equals(ID_GUARD_HEADER)) {
-			Graphiti.getGaService().setLocationAndSize(ga, thirdWidth, positionFirstLine - sizeHeader, thirdWidth, sizeHeader);
-			changesDone = true;
-		} else if (id.equals(ID_LOOP_HEADER)) {
-			Graphiti.getGaService().setLocationAndSize(ga, thirdWidth, positionSecondLine - sizeHeader, thirdWidth, sizeHeader);
-			changesDone = true;
-		} else if (id.equals(ID_PRE_HEADER)) {
-			Graphiti.getGaService().setLocationAndSize(ga, 0, positionSecondLine - sizeHeader, thirdWidth, sizeHeader);
-			changesDone = true;
-		} else if (id.equals(ID_POST_HEADER)) {
-			Graphiti.getGaService().setLocationAndSize(ga, thirdWidth * 2, positionSecondLine - sizeHeader, thirdWidth, sizeHeader);
-			changesDone = true;
-		//lines:
-		} else if (id.equals(ID_HOR1_SEP)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService().createPointList(
-					new int[] { 0, positionFirstLine, mainRectangle.getWidth(), positionFirstLine });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		} else if (id.equals(ID_HOR2_SEP)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService().createPointList(
-					new int[] { 0, positionFirstLine -sizeHeader, mainRectangle.getWidth(), positionFirstLine - sizeHeader});
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		} else if (id.equals(ID_HOR3_SEP)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService().createPointList(
-					new int[] { 0, positionSecondLine - sizeHeader, mainRectangle.getWidth(), positionSecondLine - sizeHeader});
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		} else if (id.equals(ID_HOR4_SEP)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService().createPointList(
-					new int[] { 0, positionSecondLine, mainRectangle.getWidth(), positionSecondLine });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-<<<<<<< HEAD
-=======
-		} else if (id.equals(ID_HOR5_SEP)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService().createPointList(
-					new int[] { 0, positionSecondLine + sizeBlockLower/3, thirdWidth, positionSecondLine + sizeBlockLower/3 });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		} else if (id.equals(ID_HOR6_SEP)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService().createPointList(
-					new int[] { thirdWidth*2, positionSecondLine + sizeBlockLower/3, mainRectangle.getWidth(), positionSecondLine + sizeBlockLower/3 });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
->>>>>>> master
-		} else if (id.equals(ID_VER1_SEP)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService().createPointList(
-					new int[] { thirdWidth, positionFirstLine - sizeHeader, thirdWidth, mainRectangle.getHeight() });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		} else if (id.equals(ID_VER2_SEP)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService().createPointList(
-					new int[] { thirdWidth * 2, positionFirstLine - sizeHeader, thirdWidth * 2, mainRectangle.getHeight() });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		} 
-
-		return changesDone;
-	}
-	
-	@Override
-	protected IReason updateNeeded(IdUpdateContext context, String id) {
-		if (id.equals(ID_VARIANT_TEXT)) {
-			MultiText nameText = (MultiText) context.getGraphicsAlgorithm();
-			Variant domainObject = (Variant) context.getDomainObject();
-			if (domainObject.getName() == null || !domainObject.getName().equals(nameText.getValue())) {
-			return Reason.createTrueReason("Name differs. Expected: '" + domainObject.getName() + "'");
-			}
-		} else if (id.equals(ID_MAIN_RECTANGLE)) {
-			RoundedRectangle rectangle = (RoundedRectangle) context.getGraphicsAlgorithm();
-			SmallRepetitionStatement domainObject = (SmallRepetitionStatement) context.getDomainObject();
-			if (checkIsProven(domainObject) &&
-					((rectangle.getForeground() != null && !rectangle.getForeground().equals(manageColor(IColorConstant.DARK_GREEN))) 
-							|| rectangle.getForeground() == null)) {
-				return Reason.createTrueReason("Statement is proven. Expected green color.");
-<<<<<<< HEAD
-			} else if (!checkIsProven(domainObject) && 
-					((rectangle.getForeground() != null && rectangle.getForeground().equals(manageColor(IColorConstant.DARK_GREEN))) 
-=======
-			} else if (!domainObject.isProven() && domainObject.isTested() &&
-					((rectangle.getForeground() != null && !rectangle.getForeground().equals(manageColor(IColorConstant.LIGHT_ORANGE))) 
-							|| rectangle.getForeground() == null)) {
-				return Reason.createTrueReason("Statement is tested. Expected orange color.");
-			} else if (!checkIsProven(domainObject) && !domainObject.isTested() && 
-					((rectangle.getForeground() != null && (rectangle.getForeground().equals(manageColor(IColorConstant.DARK_GREEN)) || rectangle.getForeground().equals(manageColor(IColorConstant.LIGHT_ORANGE)))) 
->>>>>>> master
-							|| rectangle.getForeground() == null)) {
-				return Reason.createTrueReason("Statement is not proven. Expected red color.");
-			}  
-		} else if (id.equals(ID_IMAGE_PROVEN)) {
-			SmallRepetitionStatement domainObject = (SmallRepetitionStatement) context.getDomainObject();
-			 Image image = (Image) context.getGraphicsAlgorithm();
-			if (checkIsProven(domainObject) && image.getId().equals(CbCImageProvider.IMG_UNPROVEN)) {
-				return Reason.createTrueReason("Statement is proven. Expected green color.");
-			} else if (!checkIsProven(domainObject) && image.getId().equals(CbCImageProvider.IMG_PROVEN)) {
-				return Reason.createTrueReason("Statement is not proven. Expected red color.");
-			} 
-		}
-		if(HighlightHelper.instance.needsInitialHighlightUpdate(context)) {
-			return Reason.createTrueReason("Element needs to be highlighted.");
-		}
-		return Reason.createFalseReason();
-	}
-
-	@Override
-	protected boolean update(IdUpdateContext context, String id) {
-		if (id.equals(ID_VARIANT_TEXT)) {
-			MultiText nameText = (MultiText) context.getGraphicsAlgorithm();
-			Variant domainObject = (Variant) context.getDomainObject();
-			nameText.setValue(domainObject.getName());
-			return true;
-		} else if (id.equals(ID_MAIN_RECTANGLE)) {
-			RoundedRectangle rectangle = (RoundedRectangle) context.getGraphicsAlgorithm();
-			SmallRepetitionStatement domainObject = (SmallRepetitionStatement) context.getDomainObject();
-			if (checkIsProven(domainObject)) {
-				domainObject.setProven(true);
-				rectangle.setForeground(manageColor(IColorConstant.DARK_GREEN));
-				updateParent(domainObject);
-<<<<<<< HEAD
-			} else {
-				domainObject.setProven(false);
-=======
-			} else if (domainObject.isTested()) {
-				domainObject.setTested(true);
-				rectangle.setForeground(manageColor(IColorConstant.LIGHT_ORANGE));
-				updateParent(domainObject);		
-			} else {
-				domainObject.setProven(false);
-				domainObject.setTested(false);
->>>>>>> master
-				domainObject.setVariantProven(false);
-				rectangle.setForeground(manageColor(IColorConstant.RED));
-				updateParent(domainObject);
-			}
-			HighlightHelper.instance.handleHighlightDrawing(context, rectangle);
-			return true;
-		} else if (id.equals(ID_IMAGE_PROVEN)) {
-			SmallRepetitionStatement domainObject = (SmallRepetitionStatement) context.getDomainObject();
-			 Image image = (Image) context.getGraphicsAlgorithm();
-			if (checkIsProven(domainObject)) {
-				image.setId(CbCImageProvider.IMG_PROVEN);
-			} else {
-				image.setId(CbCImageProvider.IMG_UNPROVEN);
-			} 
-		}
-		return false;
-	}
-<<<<<<< HEAD
-	
-=======
-		
->>>>>>> master
-	private boolean checkIsProven(SmallRepetitionStatement statement) {
-		AbstractStatement loopStatement = statement.getLoopStatement();
-		AbstractStatement firstStatementToCheck = null;
-		if (loopStatement.getRefinement() != null) {
-			firstStatementToCheck = loopStatement.getRefinement();
-		} else {
-			firstStatementToCheck = loopStatement;
-		}
-		if (firstStatementToCheck.isProven() && statement.isPreProven() && statement.isPostProven() && statement.isVariantProven()) {
-			return true;
-		} else {
-			return false;
-		}
-	}
-	
-	private void updateParent(AbstractStatement statement) {
-		if(statement.getParent()!= null) {
-			IPeService pe = Graphiti.getPeService();
-			EObject[] objArray = {statement.getParent()};
-			Object[] obj =  pe.getLinkedPictogramElements(objArray, getDiagram());
-			if (obj.length > 0) {
-				Shape pElement = (Shape) obj[0];
-				if (pElement.getContainer() != null) updatePictogramElement(pElement.getContainer());
-			}
-		}
-	}
-}
-
diff --git a/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/StrengthWeakStatementPattern.java.orig b/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/StrengthWeakStatementPattern.java.orig
deleted file mode 100644
index 965473fd3..000000000
--- a/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/StrengthWeakStatementPattern.java.orig
+++ /dev/null
@@ -1,551 +0,0 @@
-package de.tu_bs.cs.isf.cbc.tool.patterns;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.graphiti.features.IReason;
-import org.eclipse.graphiti.features.context.IAddContext;
-import org.eclipse.graphiti.features.context.ICreateContext;
-import org.eclipse.graphiti.features.context.IDirectEditingContext;
-import org.eclipse.graphiti.features.impl.Reason;
-import org.eclipse.graphiti.mm.algorithms.GraphicsAlgorithm;
-import org.eclipse.graphiti.mm.algorithms.Image;
-import org.eclipse.graphiti.mm.algorithms.MultiText;
-import org.eclipse.graphiti.mm.algorithms.Polyline;
-import org.eclipse.graphiti.mm.algorithms.RoundedRectangle;
-import org.eclipse.graphiti.mm.algorithms.Text;
-import org.eclipse.graphiti.mm.algorithms.styles.Font;
-import org.eclipse.graphiti.mm.algorithms.styles.Orientation;
-import org.eclipse.graphiti.mm.algorithms.styles.Point;
-import org.eclipse.graphiti.mm.pictograms.ContainerShape;
-import org.eclipse.graphiti.mm.pictograms.Diagram;
-import org.eclipse.graphiti.mm.pictograms.PictogramElement;
-import org.eclipse.graphiti.mm.pictograms.Shape;
-import org.eclipse.graphiti.pattern.IPattern;
-import org.eclipse.graphiti.pattern.id.IdLayoutContext;
-import org.eclipse.graphiti.pattern.id.IdPattern;
-import org.eclipse.graphiti.pattern.id.IdUpdateContext;
-import org.eclipse.graphiti.services.Graphiti;
-import org.eclipse.graphiti.services.IGaService;
-import org.eclipse.graphiti.services.IPeCreateService;
-import org.eclipse.graphiti.services.IPeService;
-import org.eclipse.graphiti.util.ColorConstant;
-import org.eclipse.graphiti.util.IColorConstant;
-import org.eclipse.graphiti.util.PredefinedColoredAreas;
-
-import de.tu_bs.cs.isf.cbc.cbcmodel.AbstractStatement;
-import de.tu_bs.cs.isf.cbc.cbcmodel.CbcmodelFactory;
-import de.tu_bs.cs.isf.cbc.cbcmodel.Condition;
-import de.tu_bs.cs.isf.cbc.cbcmodel.StrengthWeakStatement;
-import de.tu_bs.cs.isf.cbc.tool.diagram.CbCImageProvider;
-import de.tu_bs.cs.isf.cbc.tool.helper.HighlightHelper;
-<<<<<<< HEAD
-=======
-import de.tu_bs.cs.isf.cbc.tool.features.TestStatement;
->>>>>>> master
-import de.tu_bs.cs.isf.cbc.util.CompareMethodBodies;
-
-
-/**
- * Class that creates the graphical representation of Conditions
- * @author Tobias
- *
- */
-public class StrengthWeakStatementPattern extends IdPattern implements IPattern {
-
-
-	private static final String ID_NAME_TEXT = "statementText";
-	private static final String ID_PRE_TEXT = "preText";
-<<<<<<< HEAD
-	private static final String ID_POST_TEXT = "postText";
-=======
-	private static final String ID_PRE_MOD = "preConditionModifiables";
-	private static final String ID_POST_TEXT = "postText";
-	private static final String ID_POST_MOD = "postConditionModifiables";
->>>>>>> master
-	private static final String ID_MAIN_RECTANGLE = "mainRectangle";
-	private static final String ID_IMAGE_PROVEN = "imageproven";
-	//Headers:
-	private static final String ID_PRE_HEADER = "preHeader";
-	private static final String ID_POST_HEADER = "postHeader";
-	private static final String ID_NAME_HEADER = "statementHeader";
-	//Separating lines:
-	private static final String ID_HEADER_SEPARATER = "headerSeparater";
-	private static final String ID_POST_SEP = "postSep";
-	private static final String ID_PRE_SEP = "preSep";
-<<<<<<< HEAD
-=======
-	private static final String ID_HOR1_LINE = "hor1Line";
-	private static final String ID_HOR2_LINE = "hor2Line";
->>>>>>> master
-
-	/**
-	 * Constructor of the class
-	 */
-	public StrengthWeakStatementPattern() {
-		super();
-	}
-	
-	@Override
-	public String getCreateName() {
-		return "StrengthWeakStatement";
-	}
-	
-	@Override
-	public String getCreateDescription() {
-		return "Create a StrengthWeakStatement.";
-	}
-
-	@Override
-	public boolean isMainBusinessObjectApplicable(Object mainBusinessObject) {
-		return mainBusinessObject instanceof StrengthWeakStatement;
-	}
-
-	@Override
-	public boolean canCreate(ICreateContext context) {
-		return context.getTargetContainer() instanceof Diagram;
-	}
-	
-	@Override
-	public Object[] create(ICreateContext context) {
-		StrengthWeakStatement statement = CbcmodelFactory.eINSTANCE.createStrengthWeakStatement();
-		statement.setName("Statement");
-		Condition pre = CbcmodelFactory.eINSTANCE.createCondition();
-		pre.setName("");
-		statement.setPreCondition(pre);
-		Condition post = CbcmodelFactory.eINSTANCE.createCondition();
-		post.setName("");
-		statement.setPostCondition(post);
-		
-		addGraphicalRepresentation(context, statement);
-		return new Object[] { statement };
-	}
-
-	@Override
-	public boolean canAdd(IAddContext context) {
-		return super.canAdd(context) && context.getTargetContainer() instanceof Diagram;
-	}
-
-	@Override
-	public PictogramElement doAdd(IAddContext context) {
-		manageColor(IColorConstant.DARK_GREEN);
-<<<<<<< HEAD
-=======
-		manageColor(IColorConstant.LIGHT_ORANGE);
->>>>>>> master
-		Diagram targetDiagram = (Diagram) context.getTargetContainer();
-		StrengthWeakStatement addedStatement = (StrengthWeakStatement) context.getNewObject();
-		IPeCreateService peCreateService = Graphiti.getPeCreateService();
-		IGaService gaService = Graphiti.getGaService();
-
-<<<<<<< HEAD
-		int width = context.getWidth() <= 0 ? 300 : context.getWidth();
-        int height = context.getHeight() <= 0 ? 100 : context.getHeight();
-=======
-		int width = context.getWidth() <= 0 ? 350 : context.getWidth();
-        int height = context.getHeight() <= 0 ? 150 : context.getHeight();
->>>>>>> master
-        //Font:
-        Font headerFont = gaService.manageFont(getDiagram(), "Arial", 9, false, true);
-        
-		// Main contents area
-		ContainerShape outerContainerShape = peCreateService.createContainerShape(targetDiagram, true);
-		RoundedRectangle mainRectangle = gaService.createRoundedRectangle(outerContainerShape, 20, 20);
-		mainRectangle.setFilled(true);
-		gaService.setRenderingStyle(mainRectangle, PredefinedColoredAreas.getBlueWhiteAdaptions());
-		mainRectangle.setForeground(manageColor(IColorConstant.RED));
-		mainRectangle.setLineWidth(2);
-		setId(mainRectangle, ID_MAIN_RECTANGLE);
-		gaService.setLocationAndSize(mainRectangle,
-	            context.getX(), context.getY(), width, height);
-
-        // create link and wire it
-        link(outerContainerShape, addedStatement);
-
-		// Statement name
-		Shape textShape = peCreateService.createShape(outerContainerShape, true);
-		MultiText statementNameText = gaService.createMultiText(textShape, "");
-		setId(statementNameText, ID_NAME_TEXT);
-		statementNameText.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		statementNameText.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		
-		Shape preShape = peCreateService.createShape(outerContainerShape, true);
-<<<<<<< HEAD
-		MultiText preNameText = gaService.createMultiText(preShape, "{" + addedStatement.getPreCondition().getName()+ "}");
-=======
-		MultiText preNameText = gaService.createMultiText(preShape,
-				"{" + addedStatement.getPreCondition().getName() + "}");
->>>>>>> master
-		setId(preNameText, ID_PRE_TEXT);
-		preNameText.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		preNameText.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		
-<<<<<<< HEAD
-		Shape postShape = peCreateService.createShape(outerContainerShape, true);
-		MultiText postNameText = gaService.createMultiText(postShape, "{" + addedStatement.getPostCondition().getName() + "}");
-		setId(postNameText, ID_POST_TEXT);
-		postNameText.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		postNameText.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-=======
-		Shape textShapePreConditionMod = peCreateService.createShape(outerContainerShape, true);
-		MultiText preConditionTextMod = gaService.createMultiText(textShapePreConditionMod, "");
-		setId(preConditionTextMod, ID_PRE_MOD);
-		String modString = "";
-		for (String s : addedStatement.getPreCondition().getModifiables()) {
-			modString += s + ", ";
-		}
-		preConditionTextMod.setValue("modifiable(" + (modString.equals("") ? "" : modString.substring(0, modString.length() - 2)) + ");");
-		preConditionTextMod.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		preConditionTextMod.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-
-		Shape postShape = peCreateService.createShape(outerContainerShape, true);
-		MultiText postNameText = gaService.createMultiText(postShape,
-				"{" + addedStatement.getPostCondition().getName() + "}");
-		setId(postNameText, ID_POST_TEXT);
-		postNameText.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		postNameText.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		
-		Shape textShapePostConditionMod = peCreateService.createShape(outerContainerShape, true);
-		MultiText postConditionTextMod = gaService.createMultiText(textShapePostConditionMod, "");
-		setId(postConditionTextMod, ID_POST_MOD);
-		modString = "";
-		for (String s : addedStatement.getPostCondition().getModifiables()) {
-			modString += s + ", ";
-		}
-		postConditionTextMod.setValue("modifiable(" + (modString.equals("") ? "" : modString.substring(0, modString.length() - 2)) + ");");
-		postConditionTextMod.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		postConditionTextMod.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
->>>>>>> master
-
-		Shape proveShape = peCreateService.createShape(outerContainerShape, false);
-		Image image = gaService.createImage(proveShape, CbCImageProvider.IMG_UNPROVEN);
-		setId(image, ID_IMAGE_PROVEN);
-		
-		//Header:---------------
-		Shape textHeader = peCreateService.createShape(outerContainerShape, false);
-		Text statementNameHeader = gaService.createText(textHeader, "Statement");
-		setId(statementNameHeader, ID_NAME_HEADER);
-		statementNameHeader.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		statementNameHeader.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		statementNameHeader.setFont(headerFont);
-		
-		Shape preHeader = peCreateService.createShape(outerContainerShape, false);
-		Text preNameHeader = gaService.createText(preHeader, "weakened precondition");
-		setId(preNameHeader, ID_PRE_HEADER);
-		preNameHeader.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		preNameHeader.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		preNameHeader.setFont(headerFont);
-		
-		Shape postHeader = peCreateService.createShape(outerContainerShape, false);
-		Text postNameHeader = gaService.createText(postHeader, "strengthend postcondition");
-		setId(postNameHeader, ID_POST_HEADER);
-		postNameHeader.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		postNameHeader.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		postNameHeader.setFont(headerFont);
-		
-		//Separator:
-		Shape headerSepShape = peCreateService.createShape(outerContainerShape, false);
-		Polyline headerPolyline = gaService.createPolyline(headerSepShape);
-		setId(headerPolyline, ID_HEADER_SEPARATER);
-		
-		Shape preSepShape = peCreateService.createShape(outerContainerShape, false);
-		Polyline prePolyline = gaService.createPolyline(preSepShape);
-		setId(prePolyline, ID_PRE_SEP);
-		
-		Shape postSepShape = peCreateService.createShape(outerContainerShape, false);
-		Polyline postPolyline = gaService.createPolyline(postSepShape);
-		setId(postPolyline, ID_POST_SEP);
-		
-<<<<<<< HEAD
-=======
-		Shape hor1LineShape = peCreateService.createShape(outerContainerShape, false);
-		Polyline hor1Polyline = gaService.createPolyline(hor1LineShape);
-		setId(hor1Polyline, ID_HOR1_LINE);
-
-		Shape hor2LineShape = peCreateService.createShape(outerContainerShape, false);
-		Polyline hor2Polyline = gaService.createPolyline(hor2LineShape);
-		setId(hor2Polyline, ID_HOR2_LINE);
-		
->>>>>>> master
-		peCreateService.createChopboxAnchor(outerContainerShape);
-		peCreateService.createChopboxAnchor(textShape);
-
-		link(outerContainerShape, addedStatement);
-		link(textShape, addedStatement);
-		link(preShape, addedStatement.getPreCondition());
-<<<<<<< HEAD
-		link(postShape, addedStatement.getPostCondition());
-=======
-		link(textShapePreConditionMod, addedStatement.getPreCondition());
-		link(postShape, addedStatement.getPostCondition());
-		link(textShapePostConditionMod, addedStatement.getPostCondition());
->>>>>>> master
-		link(proveShape, addedStatement);
-
-		return outerContainerShape;
-	}
-
-	@Override
-	protected boolean layout(IdLayoutContext context, String id) {
-		boolean changesDone = false;
-		
-		GraphicsAlgorithm mainRectangle = context.getRootPictogramElement().getGraphicsAlgorithm();
-		GraphicsAlgorithm ga = context.getGraphicsAlgorithm();
-		int third = mainRectangle.getWidth() / 3;
-<<<<<<< HEAD
-=======
-		int thirdBlockHeight = (mainRectangle.getHeight() - 40)/3;
->>>>>>> master
-		
-		if (id.equals(ID_NAME_TEXT)) {
-			Graphiti.getGaService().setLocationAndSize(ga, third, 40, third, mainRectangle.getHeight() - 40);
-			changesDone = true;
-		} else if (id.equals(ID_PRE_TEXT)) {
-<<<<<<< HEAD
-			Graphiti.getGaService().setLocationAndSize(ga, 0, 40, third, mainRectangle.getHeight() - 40);
-			changesDone = true;
-		} else if (id.equals(ID_POST_TEXT)) {
-			Graphiti.getGaService().setLocationAndSize(ga, third * 2, 40, third, mainRectangle.getHeight() - 40); 
-=======
-			Graphiti.getGaService().setLocationAndSize(ga, 0, thirdBlockHeight+40, third, 2*thirdBlockHeight);
-			changesDone = true;
-		} else if (id.equals(ID_PRE_MOD)) {
-			Graphiti.getGaService().setLocationAndSize(ga, 0, 40, third, thirdBlockHeight);
-			changesDone = true;
-		} else if (id.equals(ID_POST_TEXT)) {
-			Graphiti.getGaService().setLocationAndSize(ga, third * 2, thirdBlockHeight+40, third, 2*thirdBlockHeight);
-			changesDone = true;
-		} else if (id.equals(ID_POST_MOD)) {
-			Graphiti.getGaService().setLocationAndSize(ga, third * 2, 40, third, thirdBlockHeight);
->>>>>>> master
-			changesDone = true;
-		} else if (id.equals(ID_IMAGE_PROVEN)) {
-			//Changes start
-			//Graphiti.getGaService().setLocationAndSize(ga, mainRectangle.getWidth() - 20, 10, 10, 10);
-			Graphiti.getGaService().setLocationAndSize(ga, mainRectangle.getWidth() - 22, 6, 12, 12);
-			//Changes end
-			changesDone = true;
-		//Header:
-		} else if (id.equals(ID_NAME_HEADER)) {
-			Graphiti.getGaService().setLocationAndSize(ga, third, 20, third, 20); //mainrectangle anpassen
-			changesDone = true;
-		} else if (id.equals(ID_PRE_HEADER)) {
-			Graphiti.getGaService().setLocationAndSize(ga, 0, 20, third, 20); 
-			changesDone = true;
-		} else if (id.equals(ID_POST_HEADER)) {
-			Graphiti.getGaService().setLocationAndSize(ga, third * 2, 20, third, 20); 
-			changesDone = true;
-		//LINES:
-		} else if (id.equals(ID_HEADER_SEPARATER)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService().createPointList(
-					new int[] { 0, 40, mainRectangle.getWidth(), 40 });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-<<<<<<< HEAD
-		} else if (id.equals(ID_POST_SEP)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService().createPointList(
-					new int[] { third, 0, third, mainRectangle.getHeight() });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		} else if (id.equals(ID_PRE_SEP)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService().createPointList(
-					new int[] { third * 2, 0, third * 2, mainRectangle.getHeight() });
-=======
-		} else if (id.equals(ID_PRE_SEP)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService()
-					.createPointList(new int[] { third * 2, 0, third * 2, mainRectangle.getHeight() });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		} else if (id.equals(ID_HOR1_LINE)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService()
-					.createPointList(new int[] { 0, thirdBlockHeight+40, third, thirdBlockHeight+40 });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		} else if (id.equals(ID_POST_SEP)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService()
-					.createPointList(new int[] { third, 0, third, mainRectangle.getHeight() });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		} else if (id.equals(ID_HOR2_LINE)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService()
-					.createPointList(new int[] { 2*third, thirdBlockHeight+40, mainRectangle.getWidth(), thirdBlockHeight+40 });
->>>>>>> master
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		}
-
-		return changesDone;
-	}
-	
-	@Override
-	protected IReason updateNeeded(IdUpdateContext context, String id) {
-		if(context.getGraphicsAlgorithm() instanceof MultiText && context.getDomainObject() instanceof StrengthWeakStatement) {
-			MultiText nameText = (MultiText) context.getGraphicsAlgorithm();
-			StrengthWeakStatement domainObject = (StrengthWeakStatement) context.getDomainObject();
-			if (domainObject.getName() == null || !domainObject.getName().equals(nameText.getValue())) {
-				return Reason.createTrueReason("Name differs. Expected: '" + domainObject.getName() + "'");
-			}
-		} 
-		else if (id.equals(ID_MAIN_RECTANGLE)) {
-			RoundedRectangle rectangle = (RoundedRectangle) context.getGraphicsAlgorithm();
-			AbstractStatement domainObject = (AbstractStatement) context.getDomainObject();
-			if (domainObject.isProven() && 
-					((rectangle.getForeground() != null && !rectangle.getForeground().equals(manageColor(IColorConstant.DARK_GREEN))) 
-							|| rectangle.getForeground() == null)) {
-				return Reason.createTrueReason("Statement is proven. Expected green color.");
-<<<<<<< HEAD
-			} else if (!domainObject.isProven() && 
-					((rectangle.getForeground() != null && rectangle.getForeground().equals(manageColor(IColorConstant.DARK_GREEN))) 
-							|| rectangle.getForeground() == null)) {
-				return Reason.createTrueReason("Statement is not proven. Expected red color.");
-			} 
-=======
-			} else if (!domainObject.isProven() && domainObject.isTested() &&
-					((rectangle.getForeground() != null && !rectangle.getForeground().equals(manageColor(IColorConstant.LIGHT_ORANGE))) 
-							|| rectangle.getForeground() == null)) {
-				return Reason.createTrueReason("Statement is tested. Expected orange color.");
-			} else if (!domainObject.isProven() && !domainObject.isTested() && 
-					((rectangle.getForeground() != null && (rectangle.getForeground().equals(manageColor(IColorConstant.DARK_GREEN)) || rectangle.getForeground().equals(manageColor(IColorConstant.LIGHT_ORANGE)))) 
-							|| rectangle.getForeground() == null)) {
-				return Reason.createTrueReason("Statement is not proven. Expected red color.");
-			}  
->>>>>>> master
-		} else if (id.equals(ID_IMAGE_PROVEN)) {
-			AbstractStatement domainObject = (AbstractStatement) context.getDomainObject();
-			 Image image = (Image) context.getGraphicsAlgorithm();
-			if (domainObject.isProven() && image.getId().equals(CbCImageProvider.IMG_UNPROVEN)) {
-				return Reason.createTrueReason("Statement is proven. Expected green color.");
-			} else if (!domainObject.isProven() && image.getId().equals(CbCImageProvider.IMG_PROVEN)) {
-				return Reason.createTrueReason("Statement is not proven. Expected red color.");
-			} 
-		}
-		if(HighlightHelper.instance.needsInitialHighlightUpdate(context)) {
-			return Reason.createTrueReason("Element needs to be highlighted.");
-		}
-		return Reason.createFalseReason();
-	}
-
-	@Override
-	protected boolean update(IdUpdateContext context, String id) {
-		if(context.getGraphicsAlgorithm() instanceof MultiText && context.getDomainObject() instanceof StrengthWeakStatement) {
-			MultiText nameText = (MultiText) context.getGraphicsAlgorithm();
-			StrengthWeakStatement domainObject = (StrengthWeakStatement) context.getDomainObject();
-			nameText.setValue(domainObject.getName());
-			return true;
-		} 
-		else if (id.equals(ID_MAIN_RECTANGLE)) {
-			RoundedRectangle rectangle = (RoundedRectangle) context.getGraphicsAlgorithm();
-			StrengthWeakStatement domainObject = (StrengthWeakStatement) context.getDomainObject();
-			AbstractStatement childStatement = domainObject.getRefinement();
-			if (domainObject.isProven() && ((childStatement != null && childStatement.isProven()) || childStatement == null)) {
-				rectangle.setForeground(manageColor(IColorConstant.DARK_GREEN));
-				if(domainObject.getParent()!= null) {
-					IPeService pe = Graphiti.getPeService();
-					EObject[] objArray = {domainObject.getParent()};
-					Object[] obj =  pe.getLinkedPictogramElements(objArray, getDiagram());
-					Shape pElement = (Shape) obj[0];
-					if (pElement.getContainer() != null) updatePictogramElement(pElement.getContainer());
-				}
-<<<<<<< HEAD
-=======
-			} else if (domainObject.isTested()) {
-				rectangle.setForeground(manageColor(IColorConstant.LIGHT_ORANGE));
-				if(domainObject.getParent()!= null) {
-					IPeService pe = Graphiti.getPeService();
-					EObject[] objArray = {domainObject.getParent()};
-					Object[] obj =  pe.getLinkedPictogramElements(objArray, getDiagram());
-					Shape pElement = (Shape) obj[0];
-					if (pElement.getContainer() != null) updatePictogramElement(pElement.getContainer());
-				}		
->>>>>>> master
-			} else {
-//				rectangle.setForeground(manageColor(IColorConstant.RED));
-//				if(domainObject.getParent()!= null) {
-//					IPeService pe = Graphiti.getPeService();
-//					EObject[] objArray = {domainObject.getParent()};
-//					Object[] obj =  pe.getLinkedPictogramElements(objArray, getDiagram());
-//					if (obj.length > 0) {
-//						Shape pElement = (Shape) obj[0];
-//						if (pElement.getContainer() != null) updatePictogramElement(pElement.getContainer());
-//					}
-//				}
-				rectangle.setForeground(manageColor(new ColorConstant(236, 215, 25)));
-			}
-			HighlightHelper.instance.handleHighlightDrawing(context, rectangle);
-			return true;
-		} else if (id.equals(ID_IMAGE_PROVEN)) {
-			StrengthWeakStatement domainObject = (StrengthWeakStatement) context.getDomainObject();
-			AbstractStatement childStatement = domainObject.getRefinement();
-			 Image image = (Image) context.getGraphicsAlgorithm();
-			if (domainObject.isProven() && ((childStatement != null && childStatement.isProven()) || childStatement == null)) {
-				image.setId(CbCImageProvider.IMG_PROVEN);
-			} else {
-				image.setId(CbCImageProvider.IMG_UNPROVEN);
-				//Changes start
-				image.setId(CbCImageProvider.IMG_WARNING);
-				//Changes end
-			} 
-		}
-		return false;
-	}
-
-	@Override
-	public int getEditingType() {
-		return TYPE_MULTILINETEXT;
-	}
-
-	@Override
-	public boolean canDirectEdit(IDirectEditingContext context) {
-		Object domainObject = getBusinessObjectForPictogramElement(context.getPictogramElement());
-		GraphicsAlgorithm ga = context.getGraphicsAlgorithm();
-		if (domainObject instanceof StrengthWeakStatement && ga instanceof MultiText) {
-			return true;
-		}
-		return false;
-	}
-
-	@Override
-	public String getInitialValue(IDirectEditingContext context) {
-		StrengthWeakStatement statement = (StrengthWeakStatement) getBusinessObjectForPictogramElement(context.getPictogramElement());
-		return statement.getName();
-	}
-
-	@Override
-	public String checkValueValid(String value, IDirectEditingContext context) {
-		System.out.println("value in streanghweak: "+value);
-		if (value == null || value.length() == 0) {
-			return "Statement must not be empty";
-		}
-		if (value.contains(";") && !CompareMethodBodies.readAndTestMethodBodyWithJaMoPP2(value)) {
-			return "Statement has not the correct syntax.";
-		}
-		return null;
-	}
-
-	@Override
-	public void setValue(String value, IDirectEditingContext context) {
-		AbstractStatement statement = (AbstractStatement) getBusinessObjectForPictogramElement(context.getPictogramElement());
-		statement.setName(value);
-		statement.setProven(false);
-<<<<<<< HEAD
-=======
-		statement.setTested(false);
->>>>>>> master
-		updatePictogramElement(context.getPictogramElement());
-	}
-}
-
diff --git a/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/VariablePattern.java.orig b/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/VariablePattern.java.orig
deleted file mode 100644
index 63de5e9a8..000000000
--- a/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/VariablePattern.java.orig
+++ /dev/null
@@ -1,292 +0,0 @@
-package de.tu_bs.cs.isf.cbc.tool.patterns;
-
-<<<<<<< HEAD
-=======
-import org.eclipse.core.resources.IProject;
->>>>>>> master
-import org.eclipse.graphiti.features.IReason;
-import org.eclipse.graphiti.features.context.IAddContext;
-import org.eclipse.graphiti.features.context.ICreateContext;
-import org.eclipse.graphiti.features.context.IDeleteContext;
-import org.eclipse.graphiti.features.context.IDirectEditingContext;
-import org.eclipse.graphiti.features.context.IRemoveContext;
-import org.eclipse.graphiti.features.impl.Reason;
-import org.eclipse.graphiti.mm.algorithms.GraphicsAlgorithm;
-import org.eclipse.graphiti.mm.algorithms.Text;
-import org.eclipse.graphiti.mm.pictograms.ContainerShape;
-import org.eclipse.graphiti.mm.pictograms.PictogramElement;
-import org.eclipse.graphiti.mm.pictograms.Shape;
-import org.eclipse.graphiti.pattern.IPattern;
-import org.eclipse.graphiti.pattern.id.IdLayoutContext;
-import org.eclipse.graphiti.pattern.id.IdPattern;
-import org.eclipse.graphiti.pattern.id.IdUpdateContext;
-
-<<<<<<< HEAD
-import de.tu_bs.cs.isf.cbc.cbcclass.model.cbcclass.ModelClass;
-=======
-import de.tu_bs.cs.isf.cbc.cbcclass.ModelClass;
-import de.tu_bs.cs.isf.cbc.cbcmodel.AbstractStatement;
-import de.tu_bs.cs.isf.cbc.cbcmodel.CbCFormula;
->>>>>>> master
-import de.tu_bs.cs.isf.cbc.cbcmodel.CbcmodelFactory;
-import de.tu_bs.cs.isf.cbc.cbcmodel.JavaVariable;
-import de.tu_bs.cs.isf.cbc.cbcmodel.JavaVariables;
-import de.tu_bs.cs.isf.cbc.cbcmodel.VariableKind;
-<<<<<<< HEAD
-=======
-import de.tu_bs.cs.isf.cbc.parser.exceptions.IFbCException;
-import de.tu_bs.cs.isf.cbc.tool.helper.GetProjectUtil;
-import de.tu_bs.cs.isf.cbc.tool.helper.UpdateInformationFlow;
-import de.tu_bs.cs.isf.lattice.Lattice;
-import de.tu_bs.cs.isf.lattice.Lattices;
->>>>>>> master
-
-/**
- * Class that creates the graphical representation of Methods
- * @author Tobias
- *
- */
-public class VariablePattern extends IdPattern implements IPattern {
-	public static final String VARIABLE_KIND_PARAMETER = "param";
-	public static final String VARIABLE_KIND_RETURN = "return";
-	public static final String VARIABLE_KIND_GLOBAL = "global";
-	public static final String VARIABLE_KIND_GLOBAL_PARAM = "global param";
-	public static final String VARIABLE_KIND_RETURNPARAM = "returnparam";
-	
-	public static final String VARIABLE_KIND_LOCAL = "local";
-	
-
-	/**
-	 * Constructor of the class
-	 */
-	public VariablePattern() {
-		super();
-	}
-	
-	@Override
-	public String getCreateName() {
-		return "Variable";
-	}
-	
-	@Override
-	public String getCreateDescription() {
-		return "Create a variable.";
-	}
-
-	@Override
-	public boolean isMainBusinessObjectApplicable(Object mainBusinessObject) {
-		return mainBusinessObject instanceof JavaVariable;
-	}
-
-	@Override
-	public boolean canCreate(ICreateContext context) {
-		return getBusinessObjectForPictogramElement(context.getTargetContainer()) instanceof JavaVariables;
-	}
-
-	@Override
-	public Object[] create(ICreateContext context) {
-		JavaVariables variables = (JavaVariables) getBusinessObjectForPictogramElement(context.getTargetContainer());
-		JavaVariable variable = CbcmodelFactory.eINSTANCE.createJavaVariable();
-		variable.setKind(VariableKind.LOCAL);
-<<<<<<< HEAD
-		variable.setName("int a");
-=======
-		variable.setName("int a_" + variables.getVariables().size());
->>>>>>> master
-		variables.getVariables().add(variable);
-		updatePictogramElement(context.getTargetContainer());
-		return new Object[] { variable };
-	}
-
-	@Override
-	public boolean canAdd(IAddContext context) {
-		return false;
-	}
-
-	@Override
-	public PictogramElement doAdd(IAddContext context) {
-		return null;
-	}
-
-	@Override
-	protected boolean layout(IdLayoutContext context, String id) {
-		return false;
-	}
-	
-	public boolean canUpdate(IdUpdateContext context) {
-        Object bo = getBusinessObjectForPictogramElement(context.getPictogramElement());
-        return (bo instanceof JavaVariable);
-    }
- 
-    public IReason updateNeeded(IdUpdateContext context, String id) {
-     	Text nameText = (Text) context.getPictogramElement().getGraphicsAlgorithm();
-		JavaVariable domainObject = (JavaVariable) getBusinessObjectForPictogramElement(context.getPictogramElement());
-		if (domainObject.getName() == null || !nameText.getValue().equals(domainObject.getDisplayedName())) {
-			return Reason.createTrueReason("Name differs. Expected: '" + domainObject.getName() + "'");
-		}
-		return Reason.createFalseReason();
-    }
- 
-    public boolean update(IdUpdateContext context, String id) {
-    	Text nameText = (Text) context.getPictogramElement().getGraphicsAlgorithm();
-		JavaVariable domainObject = (JavaVariable) getBusinessObjectForPictogramElement(context.getPictogramElement());
-		nameText.setValue(domainObject.getDisplayedName());
-		return true;
-    }
-    
-    @Override
-	public int getEditingType() {
-	    return TYPE_TEXT;
-	}
-	
-	@Override
-	public boolean canDirectEdit(IDirectEditingContext context) {
-		Object domainObject = getBusinessObjectForPictogramElement(context.getPictogramElement());
-		GraphicsAlgorithm ga = context.getGraphicsAlgorithm();
-		if (domainObject instanceof JavaVariable && ga instanceof Text) {
-			if (((Text) ga).getValue().contains(VARIABLE_KIND_LOCAL.toUpperCase())) return true;
-		}
-		return false;
-	}
-	
-
-	@Override
-	public String getInitialValue(IDirectEditingContext context) {
-		JavaVariable variable = (JavaVariable) getBusinessObjectForPictogramElement(context.getPictogramElement());
-		return variable.getDisplayedName();
-	}
-
-	
-	@Override
-	public String checkValueValid(String value, IDirectEditingContext context) {
-		if (value == null || value.length() == 0) {
-			return "Variable must not be empty";
-		} 
-		
-		
-		else if (value.length() > 0 && !value.toLowerCase().matches(
-				"("+VARIABLE_KIND_PARAMETER + "\\s"+"|"+VARIABLE_KIND_GLOBAL_PARAM + "\\s" + "|"+ VARIABLE_KIND_LOCAL + "\\s" + "|" + VARIABLE_KIND_RETURNPARAM + "\\s"+"|"+VARIABLE_KIND_RETURN+ "\\s"+"|"+VARIABLE_KIND_GLOBAL + "\\s"+ "(static\\s)?"
-				+")?(int|char|float|long|boolean|byte|short|double|([A-Za-z]\\w*))(\\[\\])?\\s[a-zA-Z]\\w*")) {
-			return "Variable must contain a kind, a type and a name";
-		}
-		return null;
-	}
-
-	@Override
-	public void setValue(String value, IDirectEditingContext context) {
-		JavaVariable variable = (JavaVariable) getBusinessObjectForPictogramElement(context.getPictogramElement());
-		if(value.trim().length() - value.trim().replaceAll(" ","").length() == 1 /*|| !value.contains("static")*/) {
-			variable.setKind(VariableKind.LOCAL);
-			variable.setName(value);
-<<<<<<< HEAD
-		}else {			
-=======
-		} else {			
->>>>>>> master
-			if(value.toLowerCase().contains("global param")) {
-				variable.setKind(VariableKind.GLOBAL_PARAM);
-				value = value.toLowerCase();
-				variable.setName(value.replaceFirst("global param ", ""));
-			} else {
-				variable.setKind(translateIntoVariableKind(value.substring(0, value.indexOf(" "))));
-				variable.setName(value.substring(value.indexOf(" ")+1));
-			}
-
-		}
-<<<<<<< HEAD
-=======
-		
-		//Start of IFbC
-		final IProject project = GetProjectUtil.getProjectForDiagram(getDiagram());
-		final Lattice lattice = Lattices.getLatticeForProject(project);
-		if (lattice != null) {
-			for (Shape shape : getDiagram().getChildren()) {
-				Object obj = getBusinessObjectForPictogramElement(shape);
-				if (obj instanceof CbCFormula) {
-					CbCFormula formula = (CbCFormula) obj;
-					try {
-						UpdateInformationFlow.updateInformationFlow(project.getName(), formula.getStatement(), lattice);
-					} catch (IFbCException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
-				}
-			}
-		}
-		
->>>>>>> master
-		updatePictogramElement(((Shape) context.getPictogramElement()));
-	}
-	
-	private VariableKind translateIntoVariableKind(String kindString) {
-		VariableKind kind = VariableKind.LOCAL;
-		kindString = kindString.toLowerCase();
-		switch(kindString) {
-		case VARIABLE_KIND_PARAMETER:
-			kind = VariableKind.PARAM;
-			break;
-		case VARIABLE_KIND_RETURN:
-			kind = VariableKind.RETURN;
-			break;
-		case VARIABLE_KIND_GLOBAL:
-			kind = VariableKind.GLOBAL;
-			break;
-//		case VARIABLE_KIND_GLOBAL_PARAM:
-//			kind = VariableKind.GLOBAL_PARAM;
-//			break;
-		case VARIABLE_KIND_RETURNPARAM:
-			kind = VariableKind.RETURNPARAM;
-			break;
-		}
-		return kind;
-	}
-
-	@Override
-	public boolean canDelete(IDeleteContext context) {
-		Shape shape = (Shape) context.getPictogramElement();
-		Text text = (Text) shape.getGraphicsAlgorithm();
-		JavaVariable jv = (JavaVariable) getBusinessObjectForPictogramElement(context.getPictogramElement());
-		if (text.getValue().trim().endsWith("inherited")) {
-			return false;
-		}
-		if (!(jv.eContainer() instanceof ModelClass) && (text.getValue().trim().startsWith("PUBLIC") || text.getValue().trim().startsWith("RETURN") || text.getValue().trim().startsWith("PARAM"))) {
-			return false;
-		}
-		return true;
-	}
-	
-	@Override
-	public boolean canRemove(IRemoveContext context) {
-		Shape shape = (Shape) context.getPictogramElement();
-		Text text = (Text) shape.getGraphicsAlgorithm();
-		JavaVariable jv = (JavaVariable) getBusinessObjectForPictogramElement(context.getPictogramElement());
-		if (text.getValue().trim().endsWith("inherited")) {
-			return false;
-		}
-		if (!(jv.eContainer() instanceof ModelClass) && (text.getValue().trim().startsWith("PUBLIC") || text.getValue().trim().startsWith("RETURN") || text.getValue().trim().startsWith("PARAM"))) {
-			return false;
-		}
-		return true;
-	}
-	
-	@Override
-	public void delete(IDeleteContext context) {
-		Shape shape = (Shape) context.getPictogramElement();
-		ContainerShape container = shape.getContainer();
-		
-		JavaVariable variable = (JavaVariable) getBusinessObjectForPictogramElement(context.getPictogramElement());
-		if (variable.eContainer() != null && variable.eContainer() instanceof JavaVariables) {
-			
-			int indexToDelete = getIndex(shape.getGraphicsAlgorithm());
-			
-			for (Shape childShape : container.getChildren()) {
-				if (getIndex(childShape.getGraphicsAlgorithm()) > indexToDelete) {
-					setIndex(childShape.getGraphicsAlgorithm(), getIndex(childShape.getGraphicsAlgorithm()) - 1);
-				}
-			}
-			super.delete(context);
-			layoutPictogramElement(container);
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/VariablesPattern.java.orig b/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/VariablesPattern.java.orig
deleted file mode 100644
index 14905103d..000000000
--- a/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/patterns/VariablesPattern.java.orig
+++ /dev/null
@@ -1,473 +0,0 @@
-package de.tu_bs.cs.isf.cbc.tool.patterns;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.graphiti.features.IReason;
-import org.eclipse.graphiti.features.context.IAddContext;
-import org.eclipse.graphiti.features.context.ICreateContext;
-import org.eclipse.graphiti.features.impl.Reason;
-import org.eclipse.graphiti.mm.algorithms.GraphicsAlgorithm;
-import org.eclipse.graphiti.mm.algorithms.Polyline;
-import org.eclipse.graphiti.mm.algorithms.RoundedRectangle;
-import org.eclipse.graphiti.mm.algorithms.Text;
-import org.eclipse.graphiti.mm.algorithms.styles.Font;
-import org.eclipse.graphiti.mm.algorithms.styles.Orientation;
-import org.eclipse.graphiti.mm.algorithms.styles.Point;
-import org.eclipse.graphiti.mm.pictograms.ContainerShape;
-import org.eclipse.graphiti.mm.pictograms.Diagram;
-import org.eclipse.graphiti.mm.pictograms.PictogramElement;
-import org.eclipse.graphiti.mm.pictograms.Shape;
-import org.eclipse.graphiti.pattern.IPattern;
-import org.eclipse.graphiti.pattern.id.IdLayoutContext;
-import org.eclipse.graphiti.pattern.id.IdPattern;
-import org.eclipse.graphiti.pattern.id.IdUpdateContext;
-import org.eclipse.graphiti.services.Graphiti;
-import org.eclipse.graphiti.services.IGaService;
-import org.eclipse.graphiti.services.IPeCreateService;
-import org.eclipse.graphiti.util.PredefinedColoredAreas;
-
-<<<<<<< HEAD
-import de.tu_bs.cs.isf.cbc.cbcclass.model.cbcclass.Field;
-import de.tu_bs.cs.isf.cbc.cbcclass.model.cbcclass.ModelClass;
-import de.tu_bs.cs.isf.cbc.cbcclass.model.cbcclass.Parameter;
-=======
-import de.tu_bs.cs.isf.cbc.cbcclass.Field;
-import de.tu_bs.cs.isf.cbc.cbcclass.Method;
-import de.tu_bs.cs.isf.cbc.cbcclass.ModelClass;
-import de.tu_bs.cs.isf.cbc.cbcclass.Parameter;
->>>>>>> master
-import de.tu_bs.cs.isf.cbc.cbcmodel.CbCFormula;
-import de.tu_bs.cs.isf.cbc.cbcmodel.CbcmodelFactory;
-import de.tu_bs.cs.isf.cbc.cbcmodel.CbcmodelPackage;
-import de.tu_bs.cs.isf.cbc.cbcmodel.JavaVariable;
-import de.tu_bs.cs.isf.cbc.cbcmodel.JavaVariables;
-import de.tu_bs.cs.isf.cbc.cbcmodel.VariableKind;
-import de.tu_bs.cs.isf.cbc.cbcmodel.impl.CbCFormulaImpl;
-<<<<<<< HEAD
-import de.tu_bs.cs.isf.cbc.tool.model.CbcModelUtil;
-import de.tu_bs.cs.isf.cbc.util.FileUtil;
-import helper.ClassUtil;
-=======
-import de.tu_bs.cs.isf.cbc.util.CbcModelUtil;
-import de.tu_bs.cs.isf.cbc.util.ClassUtil;
-import de.tu_bs.cs.isf.cbc.util.DiagramPartsExtractor;
-import de.tu_bs.cs.isf.cbc.util.FeatureUtil;
-import de.tu_bs.cs.isf.cbc.util.FileUtil;
->>>>>>> master
-
-/**
- * Class that creates the graphical representation of Methods
- * 
- * @author Tobias
- *
- */
-public class VariablesPattern extends IdPattern implements IPattern {
-
-	private static final String ID_NAME_TEXT = "variablesName";
-	private static final String ID_VARIABLE_TEXT = "variable";
-	private static final String ID_MAIN_RECTANGLE = "mainRectangle";
-	// lines:
-	private static final String ID_HOR1_LINE = "hor1Line";
-
-	/**
-	 * Constructor of the class
-	 */
-	public VariablesPattern() {
-		super();
-	}
-
-	@Override
-	public String getCreateName() {
-		return "Variables";
-	}
-
-	@Override
-	public String getCreateDescription() {
-		return "Create a list of variables.";
-	}
-
-	@Override
-	public boolean isMainBusinessObjectApplicable(Object mainBusinessObject) {
-		return mainBusinessObject instanceof JavaVariables;
-	}
-
-	@Override
-	public boolean canCreate(ICreateContext context) {
-<<<<<<< HEAD
-		JavaVariables vars = null;
-		for (Shape shape : getDiagram().getChildren()) {
-			Object obj = getBusinessObjectForPictogramElement(shape);
-			if (obj instanceof JavaVariables) {
-				vars = (JavaVariables) obj;
-			}
-		}
-=======
-		DiagramPartsExtractor extractor = new DiagramPartsExtractor(getDiagram());
-		JavaVariables vars = extractor.getVars();
->>>>>>> master
-		if (vars != null)
-			return false;
-		return context.getTargetContainer() instanceof Diagram;
-	}
-
-	@Override
-	public Object[] create(ICreateContext context) {
-		JavaVariables variables = CbcmodelFactory.eINSTANCE.createJavaVariables();
-		JavaVariable variable = CbcmodelFactory.eINSTANCE.createJavaVariable();
-		variable.setName("int a");
-		variable.setKind(VariableKind.LOCAL);
-		variables.getVariables().add(variable);
-
-		try {
-			Resource resource = CbcModelUtil.getResource(getDiagram());
-			for(EObject c:resource.getContents()){
-				if(c instanceof CbCFormulaImpl) {
-					CbCFormula formula = (CbCFormula) c;
-					if(formula.getMethodObj()!= null) {
-						EList<Field> fields = formula.getMethodObj().getParentClass().getFields();
-						variables.eSet(CbcmodelPackage.eINSTANCE.getJavaVariables_Fields(), fields);
-					}
-				}
-			}
-			CbcModelUtil.saveVariablesToModelFile(variables, getDiagram());
-		} catch (CoreException | IOException e) {
-			e.printStackTrace();
-		}
-
-		addGraphicalRepresentation(context, variables);
-		return new Object[] { variables };
-	}
-
-	@Override
-	public boolean canAdd(IAddContext context) {
-		return super.canAdd(context) && context.getTargetContainer() instanceof Diagram;
-	}
-
-	@Override
-	public PictogramElement doAdd(IAddContext context) {
-		Diagram targetDiagram = (Diagram) context.getTargetContainer();
-		JavaVariables addedVariables = (JavaVariables) context.getNewObject();
-		IPeCreateService peCreateService = Graphiti.getPeCreateService();
-		IGaService gaService = Graphiti.getGaService();
-
-		int width = context.getWidth() <= 0 ? 200 : context.getWidth();
-		int height = context.getHeight() <= 0 ? 100 : context.getHeight();
-
-		Font headerFont = gaService.manageFont(getDiagram(), "Arial", 9, false, true);
-
-		// Main contents area
-		ContainerShape outerContainerShape = peCreateService.createContainerShape(targetDiagram, true);
-		RoundedRectangle mainRectangle = gaService.createRoundedRectangle(outerContainerShape, 20, 20);
-		mainRectangle.setFilled(true);
-		gaService.setRenderingStyle(mainRectangle, PredefinedColoredAreas.getBlueWhiteAdaptions());
-		setId(mainRectangle, ID_MAIN_RECTANGLE);
-		gaService.setLocationAndSize(mainRectangle, context.getX(), context.getY(), width, height);
-
-		// create link and wire it
-		link(outerContainerShape, addedVariables);
-
-		// method name
-		Shape nameTextShape = peCreateService.createShape(outerContainerShape, false);
-		Text variablesNameText = gaService.createText(nameTextShape, "Variables");
-		setId(variablesNameText, ID_NAME_TEXT);
-		variablesNameText.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		variablesNameText.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		variablesNameText.setFont(headerFont);
-
-		// line:
-		Shape hor1Shape = peCreateService.createShape(outerContainerShape, false);
-		Polyline hor1line = gaService.createPolyline(hor1Shape);
-		setId(hor1line, ID_HOR1_LINE);
-
-		link(outerContainerShape, addedVariables);
-		link(nameTextShape, addedVariables);
-
-		return outerContainerShape;
-	}
-
-	@Override
-	protected boolean layout(IdLayoutContext context, String id) {
-		boolean changesDone = false;
-		GraphicsAlgorithm mainRectangle = context.getRootPictogramElement().getGraphicsAlgorithm();
-		JavaVariables variables = (JavaVariables) getBusinessObjectForPictogramElement(context.getRootPictogramElement());
-		EList<Field> inheritedFields = null;
-		if (getDiagram().eResource().getURI().isPlatform()) {
-<<<<<<< HEAD
-			String featureName = ((JavaVariables) getBusinessObjectForPictogramElement(context.getRootPictogramElement())).eResource().getURI().segment(((JavaVariables) getBusinessObjectForPictogramElement(context.getRootPictogramElement())).eResource().getURI().segmentCount() - 3);
-			String className = ((JavaVariables) getBusinessObjectForPictogramElement(context.getRootPictogramElement())).eResource().getURI().segment(((JavaVariables) getBusinessObjectForPictogramElement(context.getRootPictogramElement())).eResource().getURI().segmentCount() - 2);
-			Resource classResource = ClassUtil.getClassModelResource(FileUtil.getProjectLocation(getDiagram().eResource().getURI().trimFileExtension().appendFileExtension("cbcmodel")), className, featureName);
-			if (classResource != null &&((ModelClass) classResource.getContents().get(0)).getInheritsFrom() != null) {
-=======
-			String featureName = FeatureUtil.getInstance().getCallingFeature(((JavaVariables) getBusinessObjectForPictogramElement(context.getRootPictogramElement())).eResource().getURI());
-			String className = FeatureUtil.getInstance().getCallingClass(((JavaVariables) getBusinessObjectForPictogramElement(context.getRootPictogramElement())).eResource().getURI());
-			Resource classResource = ClassUtil.getClassModelResource(FileUtil.getProjectLocation(getDiagram().eResource().getURI().trimFileExtension().appendFileExtension("cbcmodel")), className, featureName);
-			if (classResource != null && classResource.getContents().size() > 0 && ((ModelClass) classResource.getContents().get(0)).getInheritsFrom() != null) {
->>>>>>> master
-				inheritedFields = ((ModelClass) classResource.getContents().get(0)).getInheritsFrom().getFields();	
-			}
-		}
-		int size = variables.getVariables().size() + (variables.getFields() != null ? variables.getFields().size() : 0) + (inheritedFields != null ? inheritedFields.size() : 0) + (variables.getParams() != null ? variables.getParams().size() : 0) ;
-		GraphicsAlgorithm ga = context.getGraphicsAlgorithm();
-		int height = mainRectangle.getHeight();
-		if (size >= 1) {
-			height = height / (size + 1);
-		}
-
-		if (id.equals(ID_NAME_TEXT)) {
-			Graphiti.getGaService().setLocationAndSize(ga, 0, 0, mainRectangle.getWidth(), height);
-			changesDone = true;
-		} else if (id.equals(ID_VARIABLE_TEXT)) {
-			int index = getIndex(context.getGraphicsAlgorithm());
-			Graphiti.getGaService().setLocationAndSize(ga, 0, height * (index + 1), mainRectangle.getWidth(), height);
-			changesDone = true;
-		} else if (id.equals(ID_HOR1_LINE)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService()
-					.createPointList(new int[] { 0, height, mainRectangle.getWidth(), height });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		}
-		return changesDone;
-	}
-
-	@Override
-	protected IReason updateNeeded(IdUpdateContext context, String id) {
-		if (id.equals(ID_MAIN_RECTANGLE)) {
-			ContainerShape containerShape = (ContainerShape) context.getPictogramElement();
-			EList<JavaVariable> variables = ((JavaVariables) context.getDomainObject()).getVariables();
-			EList<Field> fields = ((JavaVariables) context.getDomainObject()).getFields();
-			EList<Parameter> params = ((JavaVariables) context.getDomainObject()).getParams();
-			EList<Field> inheritedFields = null;
-<<<<<<< HEAD
-			String className = ((JavaVariables) context.getDomainObject()).eResource().getURI().segment(((JavaVariables) context.getDomainObject()).eResource().getURI().segmentCount() - 2);
-			String featureName = ((JavaVariables) context.getDomainObject()).eResource().getURI().segment(((JavaVariables) context.getDomainObject()).eResource().getURI().segmentCount() - 4).equals("features") ? ((JavaVariables) context.getDomainObject()).eResource().getURI().segment(((JavaVariables) context.getDomainObject()).eResource().getURI().segmentCount() - 3) : "";
-			String methodName = getDiagram().eResource().getURI().trimFileExtension().segment(getDiagram().eResource().getURI().segmentCount()-1);
-			if (getDiagram().eResource().getURI().isPlatform()) {
-				Resource classResource = ClassUtil.getClassModelResource(FileUtil.getProjectLocation(getDiagram().eResource().getURI().trimFileExtension().appendFileExtension("cbcmodel")), className, featureName);
-				if (classResource != null && ((ModelClass) classResource.getContents().get(0)).getInheritsFrom() != null) {
-=======
-			String className = FeatureUtil.getInstance().getCallingClass(((JavaVariables) context.getDomainObject()).eResource().getURI());
-			String featureName = FeatureUtil.getInstance().getCallingFeature(((JavaVariables) context.getDomainObject()).eResource().getURI());
-			String methodName = getDiagram().eResource().getURI().trimFileExtension().segment(getDiagram().eResource().getURI().segmentCount()-1);
-			if (getDiagram().eResource().getURI().isPlatform()) {
-				Resource classResource = ClassUtil.getClassModelResource(FileUtil.getProjectLocation(getDiagram().eResource().getURI().trimFileExtension().appendFileExtension("cbcmodel")), className, featureName);
-				if (classResource != null && classResource.getContents().size() > 0 && ((ModelClass) classResource.getContents().get(0)).getInheritsFrom() != null) {
->>>>>>> master
-					inheritedFields = ((ModelClass) classResource.getContents().get(0)).getInheritsFrom().getFields();	
-				}
-			}
-			// in some cases getFields/getParams do not return fields/params; backup via modelclass
-			if (fields.size() == 0 || params.size() == 0) {
-				Resource classResource = ClassUtil.getClassModelResource(FileUtil.getProjectLocation(getDiagram().eResource().getURI().trimFileExtension().appendFileExtension("cbcmodel")), className, featureName);				
-<<<<<<< HEAD
-				if (classResource != null && classResource.getContents().get(0) instanceof ModelClass) {
-					ModelClass mc = (ModelClass) classResource.getContents().get(0);
-					fields = mc.getFields();
-					for (de.tu_bs.cs.isf.cbc.cbcclass.model.cbcclass.Method m : mc.getMethods()) {
-=======
-				if (classResource != null && classResource.getContents().size() > 0 && classResource.getContents().get(0) instanceof ModelClass) {
-					ModelClass mc = (ModelClass) classResource.getContents().get(0);
-					fields = mc.getFields();
-					for (Method m : mc.getMethods()) {
->>>>>>> master
-						if (m.getName().equals(methodName)) {
-							params = m.getParameters();
-							break;
-						}
-					}
-				}			
-			}
-			
-			int size = variables.size() + fields.size() + params.size() + (inheritedFields != null ? inheritedFields.size() : 0);
-			if (containerShape.getChildren().size() - 2 != size) {
-				return Reason.createTrueReason("Number of Variables differ. Expected: " + size + " Actual: " + (containerShape.getChildren().size() - 2));
-			}
-			
-			List<Integer> found = new ArrayList<Integer>();
-			EList<Shape> shapes = containerShape.getChildren();
-			for (int i = 2; i < shapes.size(); i++) {
-				Shape shape = shapes.get(i);
-				EList<EObject> objects = shape.eContents();
-				for (int j = 0; j < objects.size(); j++) {
-					EObject obj = objects.get(j);
-					if (obj instanceof Text) {
-						for (int k = 0; k < fields.size(); k++) {
-							Field f = fields.get(k);
-							if (f.getDisplayedName().equalsIgnoreCase(((Text) obj).getValue())) {
-								found.add(k);
-								break;
-							}
-						}
-						if (inheritedFields != null) {
-						for (int k = 0; k < inheritedFields.size(); k++) {
-							Field f = inheritedFields.get(k);
-							if (f.getDisplayedName().equalsIgnoreCase(((Text) obj).getValue().replace(" inherited",""))) {
-								found.add(k + fields.size());
-								break;
-							}
-						}
-						}
-						for (int k = 0; k < params.size(); k++) {
-							Parameter p = params.get(k);
-							if ((("PARAM " + p.getType() + " " + p.getName()).equalsIgnoreCase(((Text) obj).getValue()) || ("RETURN " + p.getType() + " " + p.getName()).equalsIgnoreCase(((Text) obj).getValue()))) {
-								found.add(k + fields.size() + (inheritedFields != null ? inheritedFields.size() : 0));
-								break;
-							}
-						}
-						break;
-					}
-				}
-			}
-			if (found.size() != (fields.size() + params.size() + (inheritedFields != null ? inheritedFields.size() : 0))) {
-				return Reason.createTrueReason("Class fields differ from ModelClass.");
-			}	
-		}
-		updateGraphicsAlgorithmChildren(context.getGraphicsAlgorithm(), context);
-		return Reason.createFalseReason();
-	}
-	
-	@Override
-	public boolean update(IdUpdateContext context, String id) {
-		if (id.equals(ID_MAIN_RECTANGLE)) {
-			EList<JavaVariable> variables = ((JavaVariables) context.getDomainObject()).getVariables();
-			EList<Field> fields = ((JavaVariables) context.getDomainObject()).getFields();
-			EList<Parameter> params = ((JavaVariables) context.getDomainObject()).getParams();
-			EList<Field> inheritedFields = null;
-<<<<<<< HEAD
-			String className = ((JavaVariables) context.getDomainObject()).eResource().getURI().segment(((JavaVariables) context.getDomainObject()).eResource().getURI().segmentCount() - 2);
-			String featureName = ((JavaVariables) context.getDomainObject()).eResource().getURI().segment(((JavaVariables) context.getDomainObject()).eResource().getURI().segmentCount() - 4).equals("features") ? ((JavaVariables) context.getDomainObject()).eResource().getURI().segment(((JavaVariables) context.getDomainObject()).eResource().getURI().segmentCount() - 3) : "";
-			String methodName = getDiagram().eResource().getURI().trimFileExtension().segment(getDiagram().eResource().getURI().segmentCount()-1);
-			if (getDiagram().eResource().getURI().isPlatform()) {
-				Resource classResource = ClassUtil.getClassModelResource(FileUtil.getProjectLocation(getDiagram().eResource().getURI().trimFileExtension().appendFileExtension("cbcmodel")), className, featureName);
-				if (classResource != null &&((ModelClass) classResource.getContents().get(0)).getInheritsFrom() != null) {
-=======
-			String className = FeatureUtil.getInstance().getCallingClass(((JavaVariables) context.getDomainObject()).eResource().getURI());
-			String featureName = FeatureUtil.getInstance().getCallingFeature(((JavaVariables) context.getDomainObject()).eResource().getURI());
-			String methodName = getDiagram().eResource().getURI().trimFileExtension().segment(getDiagram().eResource().getURI().segmentCount()-1);
-			if (getDiagram().eResource().getURI().isPlatform()) {
-				Resource classResource = ClassUtil.getClassModelResource(FileUtil.getProjectLocation(getDiagram().eResource().getURI().trimFileExtension().appendFileExtension("cbcmodel")), className, featureName);
-				if (classResource != null && classResource.getContents().size() > 0 && ((ModelClass) classResource.getContents().get(0)).getInheritsFrom() != null) {
->>>>>>> master
-					inheritedFields = ((ModelClass) classResource.getContents().get(0)).getInheritsFrom().getFields();	
-				}
-			}
-			
-			// in some cases getFields/getParams do not return fields/params; backup via modelclass
-			if (fields.size() == 0 || params.size() == 0) {
-				Resource classResource = ClassUtil.getClassModelResource(FileUtil.getProjectLocation(getDiagram().eResource().getURI().trimFileExtension().appendFileExtension("cbcmodel")), className, featureName);				
-<<<<<<< HEAD
-				if (classResource != null && classResource.getContents().get(0) instanceof ModelClass) {
-					ModelClass mc = (ModelClass) classResource.getContents().get(0);
-					fields = mc.getFields();
-					for (de.tu_bs.cs.isf.cbc.cbcclass.model.cbcclass.Method m : mc.getMethods()) {
-=======
-				if (classResource != null && classResource.getContents().size() > 0 && classResource.getContents().get(0) instanceof ModelClass) {
-					ModelClass mc = (ModelClass) classResource.getContents().get(0);
-					fields = mc.getFields();
-					for (Method m : mc.getMethods()) {
->>>>>>> master
-						if (m.getName().equals(methodName)) {
-							params = m.getParameters();
-							break;
-						}
-					}
-				}			
-			}
-			
-			List<Integer> checkedShapes = new ArrayList<>();
-			checkedShapes.add(0);
-			checkedShapes.add(1);			
-			
-			for (int i = 0; i < params.size() + variables.size() + fields.size() + (inheritedFields != null ? inheritedFields.size() : 0); i++) {
-				Parameter param = null;
-				JavaVariable var = null;
-				Field field = null;
-				String name = "";
-				if (i < params.size()) {
-					param = params.get(i);
-					param.eResource();
-					if (!param.getName().equals("ret")) {
-						name = "PARAM " + param.getType() + " " + param.getName();
-					} else {
-						name = "RETURN " + param.getType() + " " + param.getName();
-					}
-				} else if (i < variables.size() + params.size()) {
-					var = variables.get(i - params.size());
-					name = var.getDisplayedName();
-				} else if (i < fields.size() + variables.size() + params.size()) {
-					field = fields.get(i - params.size() - variables.size());
-					name = field.getDisplayedName();
-				} else {
-					field = inheritedFields.get(i - params.size() - variables.size() - fields.size());
-					name = field.getDisplayedName();
-				}
-				EList<Shape> shapes = ((ContainerShape) context.getPictogramElement()).getChildren();
-				boolean check = false;
-				for (int j = 2; j < shapes.size(); j++) {
-					Shape shape = shapes.get(j);
-					Text text = (Text) shape.getGraphicsAlgorithm();
-					if (name.equals(text.getValue().replace(" inherited", ""))) {
-						check = true;
-						checkedShapes.add(j);
-						break;
-					}
-				}
-				if (!check) {
-					int newIndex = 0;
-					ContainerShape container = (ContainerShape) context.getPictogramElement();
-					for (Shape childShape : container.getChildren()) {
-						if (getIndex(childShape.getGraphicsAlgorithm()) >= newIndex) {
-							setIndex(childShape.getGraphicsAlgorithm(), getIndex(childShape.getGraphicsAlgorithm()) + 1);
-						}
-					}
-					Shape shapeText = Graphiti.getPeCreateService().createShape((ContainerShape) context.getPictogramElement(), true);
-					Text variableNameText = Graphiti.getGaService().createText(shapeText, (name + (i < (params.size() + variables.size() + fields.size()) ? "" : " inherited")));
-					setId(variableNameText, ID_VARIABLE_TEXT);
-					setIndex(variableNameText, newIndex);
-					variableNameText.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-					variableNameText.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-					link(shapeText, (param != null ? param : (var != null ? var : field)));
-					checkedShapes.add(shapes.size()-1);
-				}
-			}
-			
-			//delete shapes that didn't match any param, field or variable
-			EList<Shape> shapes = ((ContainerShape) context.getPictogramElement()).getChildren();
-			for (int i = 2; i < shapes.size(); i++) {
-				if (!checkedShapes.contains(i)) {
-					Shape shape = shapes.get(i);
-					int indexToDelete = getIndex(shape.getGraphicsAlgorithm());
-					for (Shape childShape : shapes) {
-						if (getIndex(childShape.getGraphicsAlgorithm()) > indexToDelete) {
-							setIndex(childShape.getGraphicsAlgorithm(),	getIndex(childShape.getGraphicsAlgorithm()) - 1);
-						}
-					}
-					EcoreUtil.delete(shape.getLink());
-					EcoreUtil.delete(shape);
-					for (int j = 0; j < checkedShapes.size(); j++) {
-						int oldVal = checkedShapes.get(j);
-						if (oldVal > i) {
-							int newVal = oldVal - 1;
-							checkedShapes.set(j, newVal);
-						}
-					}
-					i--;
-				}
-			}
-			return true;
-		}
-		return false;
-	}
-<<<<<<< HEAD
-}
-=======
-}
->>>>>>> master
diff --git a/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/propertiesview/BasicsSection.java.orig b/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/propertiesview/BasicsSection.java.orig
deleted file mode 100644
index 8b7990c42..000000000
--- a/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/propertiesview/BasicsSection.java.orig
+++ /dev/null
@@ -1,338 +0,0 @@
-package de.tu_bs.cs.isf.cbc.tool.propertiesview;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-
-import java.util.ArrayList;
-
-import javax.swing.JOptionPane;
-
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.graphiti.dt.IDiagramTypeProvider;
-import org.eclipse.graphiti.features.context.impl.UpdateContext;
-import org.eclipse.graphiti.mm.algorithms.Text;
-import org.eclipse.graphiti.mm.algorithms.impl.TextImpl;
-import org.eclipse.graphiti.mm.pictograms.ContainerShape;
-import org.eclipse.graphiti.mm.pictograms.Diagram;
-import org.eclipse.graphiti.mm.pictograms.PictogramElement;
-import org.eclipse.graphiti.mm.pictograms.Shape;
-import org.eclipse.graphiti.mm.pictograms.impl.ContainerShapeImpl;
-import org.eclipse.graphiti.ui.platform.GFPropertySection;
-import org.eclipse.graphiti.ui.services.GraphitiUi;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Device;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.views.properties.tabbed.ITabbedPropertyConstants;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
-
-<<<<<<< HEAD
-import de.tu_bs.cs.isf.cbc.cbcclass.model.cbcclass.Method;
-import de.tu_bs.cs.isf.cbc.cbcclass.model.cbcclass.impl.MethodImpl;
-=======
-import de.tu_bs.cs.isf.cbc.cbcclass.Method;
->>>>>>> master
-import de.tu_bs.cs.isf.cbc.cbcmodel.AbstractStatement;
-import de.tu_bs.cs.isf.cbc.cbcmodel.CbCFormula;
-import de.tu_bs.cs.isf.cbc.cbcmodel.Condition;
-import de.tu_bs.cs.isf.cbc.cbcmodel.impl.CbCFormulaImpl;
-import de.tu_bs.cs.isf.cbc.tool.diagram.CbCDiagramTypeProvider;
-
-<<<<<<< HEAD
-=======
-import de.tu_bs.cs.isf.cbc.util.ClassUtil;
->>>>>>> master
-import de.tu_bs.cs.isf.cbc.util.Console;
-
-import de.tu_bs.cs.isf.cbc.tool.diagram.CbCFeatureProvider;
-import de.tu_bs.cs.isf.cbc.util.FileUtil;
-<<<<<<< HEAD
-import helper.ClassUtil;
-=======
-import de.tu_bs.cs.isf.cbc.util.ClassUtil;
->>>>>>> master
-
-public class BasicsSection extends GFPropertySection implements ITabbedPropertyConstants {
-	
-
-	Display display = Display.getCurrent();// for UI updating of back-process
-	boolean variationalProject = false;
-	
-	// Defining the UI properties
-	private Label classLabel;
-	private Label classLabelText;
-
-	private Label invariantLabel;
-	private List invariantList;
-	
-	private Label methodSignatureLabel;
-	private StyledText methodSignatureLabelText;
-	private boolean methodSignatureLabelChanged = false;
-	
-	private Label featureLabel;
-	private Label featureLabelText;
-	
-	private Label compositionTechniqueLabel;
-	private Label compositionTechniqueLabelText;
-	
-	private Button saveButton;
-	private Object bo;
-
-	@Override
-	public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
-		super.createControls(parent, tabbedPropertySheetPage);
-		Device device = Display.getCurrent();
-		TabbedPropertySheetWidgetFactory factory = getWidgetFactory();
-
-		Composite composite = factory.createFlatFormComposite(parent);
-		
-		// Defining GridLayout for properties-view
-		GridLayout gridLayout = new GridLayout();
-		gridLayout.numColumns = 2;
-		gridLayout.verticalSpacing = 20;
-		composite.setLayout(gridLayout);
-		Color white = new Color (device, 255, 255, 255);
-		
-		// featureLabel
-		featureLabel = new Label(composite, SWT.PUSH);
-		featureLabel.setBackground(white);
-		featureLabel.setText("Feature: ");
-		
-		// featureLabelText
-		featureLabelText = new Label(composite, SWT.PUSH);
-		featureLabelText.setBackground(white);
-		
-		// compositionTechniqueLabel
-		compositionTechniqueLabel = new Label(composite, SWT.PUSH);
-		compositionTechniqueLabel.setBackground(white);
-		compositionTechniqueLabel.setText("Composition technique: ");
-						
-		// compositionTechniqueLabelText
-		compositionTechniqueLabelText = new Label(composite, SWT.PUSH);
-		compositionTechniqueLabelText.setBackground(white);	
-		
-		// classLabel
-		classLabel = new Label(composite, SWT.PUSH);
-		classLabel.setBackground(white);
-		classLabel.setText("Class: ");
-		
-		// classLabelText
-		classLabelText = new Label(composite, SWT.PUSH);
-		classLabelText.setBackground(white);
-		
-		// methodSignatureLabel
-		methodSignatureLabel = new Label(composite, SWT.PUSH);
-		methodSignatureLabel.setText("MethodSignature: ");
-		methodSignatureLabel.setBackground(white);
-		
-		// methodSignatureLabelText
-		methodSignatureLabelText = new StyledText(composite, SWT.WRAP | SWT.PUSH | SWT.BORDER);
-		GridData methodSignatureLabelTextGridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-		methodSignatureLabelText.setEditable(true);
-		methodSignatureLabelText.setLayoutData(methodSignatureLabelTextGridData);
-		methodSignatureLabelText.setBackground(white);
-		methodSignatureLabelText.addModifyListener(new ModifyListener() {
-			@Override
-			public void modifyText(ModifyEvent e) {
-				methodSignatureLabelChanged = true;
-				saveButton.setEnabled(true);
-			}
-		});
-		
-		// invariantLabel
-		invariantLabel = new Label(composite, SWT.PUSH);
-		invariantLabel.setText("Invariants: ");
-		invariantLabel.setBackground(white);
-
-		// invariantLabelText
-		invariantList = new List(composite, SWT.MULTI | SWT.BORDER | SWT.V_SCROLL);
-		invariantList.setItems();
-	    int listHeight = invariantList.getItemHeight() * 5;
-
-	    Rectangle trim = invariantList.computeTrim(0, 0, 0, listHeight);
-	    GridData invariantLabelTextGridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-	    invariantLabelTextGridData.heightHint = trim.height;
-	    invariantList.setLayoutData(invariantLabelTextGridData);
-	    invariantList.setBackground(white);
-	    invariantList.addSelectionListener(new SelectionListener() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				// TODO Auto-generated method stub
-			}
-
-			@Override
-			public void widgetDefaultSelected(SelectionEvent e) {
-				// TODO Auto-generated method stub
-			}
-		});
-		
-		// generateButton
-		saveButton = new Button(composite, SWT.PUSH);
-		saveButton.setText("Save");
-		saveButton.setEnabled(false);
-		saveButton.addListener(SWT.Selection, new Listener() {
-			@Override
-			public void handleEvent(Event e) {
-				TransactionalEditingDomain domain = TransactionUtil.getEditingDomain(bo);
-				domain.getCommandStack().execute(new RecordingCommand(domain) {
-					@Override
-					protected void doExecute() {						
-						if(methodSignatureLabelChanged) {
-							String text = methodSignatureLabelText.getText();
-							changeMethodSignature(text);
-							methodSignatureLabelChanged = false;
-						}
-						saveButton.setEnabled(false);
-						refresh();
-					}
-				});
-			}
-		});
-		
-	}
-
-	@Override
-	public void refresh() {
-		CbCDiagramTypeProvider diagramProvider = new CbCDiagramTypeProvider();
-		PictogramElement pe = getSelectedPictogramElement();
-		bo = diagramProvider.getFeatureProvider().getBusinessObjectForPictogramElement(pe);
-		if(bo instanceof CbCFormulaImpl) {
-			updateData(bo);			
-		}
-	}
-	
-	public void changeMethodSignature(String newMethodSignature) {
-		Method methodobj = null;
-		if(bo instanceof CbCFormula) {
-			methodobj = ((CbCFormula) bo).getMethodObj();
-		}else if(bo instanceof AbstractStatement) {
-			CbCFormula formula = getFormula((AbstractStatement)bo);
-			methodobj = formula.getMethodObj();
-		}else {
-			Console.println("Click on formula!");
-		}
-		
-		if(methodobj != null) {
-			String oldName = methodobj.getName();
-			String oldSignature = methodobj.getSignature();
-			methodobj.setSignature(newMethodSignature.trim());
-			if (!oldName.equals(methodobj.getName())) {
-				methodobj.setSignature(oldSignature);
-				JOptionPane.showMessageDialog(null, "Can not change name of method in the this state of CorC.");
-				return;
-			}
-		}
-		getDiagramTypeProvider().getDiagramBehavior().refresh();
-		
-		//automatic update of vp in cbcmodel
-		Resource diagram_Resource = ClassUtil.getCbcDiagramResource(FileUtil.getProjectLocation(getDiagram().eResource().getURI()), methodobj.getName());
-		Diagram diagram = (Diagram) diagram_Resource.getContents().get(0);
-		ArrayList<PictogramElement> pes = new ArrayList<PictogramElement>();
-		IDiagramTypeProvider dtp = GraphitiUi.getExtensionManager().createDiagramTypeProvider(diagram, "de.tu-bs.cs.isf.cbc.tool.CbCDiagramTypeProvider");
-		CbCFeatureProvider featureProvider = (CbCFeatureProvider) dtp.getFeatureProvider();
-		
-		for (int j = 0; j < diagram_Resource.getContents().get(0).eContents().size(); j++) {
-			if (diagram_Resource.getContents().get(0).eContents().get(j).getClass().equals(ContainerShapeImpl.class)) {
-				pes.add((PictogramElement) diagram_Resource.getContents().get(0).eContents().get(j));
-			}
-		}
-		for (PictogramElement pe : pes) {
-			ContainerShape container = (ContainerShape) pe;
-			Shape shape = (Shape) container.getChildren().get(0);
-			if (shape.getGraphicsAlgorithm() instanceof TextImpl) {
-				Text text = (Text) container.getChildren().get(0).getGraphicsAlgorithm();
-				if (text.getValue().equals("Variables")) {
-					UpdateContext updateContext = new UpdateContext(pe);
-					featureProvider.updateIfPossible(updateContext);
-				}	
-			}			
-		}		
-	}
-
-	public void updateData(Object bo) {
-		display.syncExec(new Runnable() {
-			@Override
-			public void run() {
-				boolean isVariational = false;
-				// update methodSignature, invariants, feature
-<<<<<<< HEAD
-				if(((CbCFormulaImpl) bo).getMethodObj() instanceof MethodImpl) {
-=======
-				if(((CbCFormulaImpl) bo).getMethodObj() instanceof Method) {
->>>>>>> master
-					Method methodObj = (Method) ((CbCFormulaImpl) bo).getMethodObj();
-					methodSignatureLabelText.setText(methodObj.getSignature());
-					classLabelText.setText(methodObj.getParentClass().getName() + (methodObj.getParentClass().getInheritsFrom() != null ? (" extends " + methodObj.getParentClass().getInheritsFrom().getName()) : ""));
-					EList<Condition> classInvariants = methodObj.getParentClass().getClassInvariants();
-					EList<Condition> inheritedClassInvariants = null;
-					if (methodObj.getParentClass().getInheritsFrom() != null) {
-						inheritedClassInvariants = methodObj.getParentClass().getInheritsFrom().getClassInvariants();
-					}
-					String[] invariants = new String[classInvariants.size() + (inheritedClassInvariants != null ? inheritedClassInvariants.size() : 0)];
-					for (int i = 0; i < classInvariants.size(); i++){
-						invariants[i] = classInvariants.get(i).getName();
-					}
-
-					if (inheritedClassInvariants != null) {
-						for (int i = classInvariants.size(); i<invariants.length; i++){
-							invariants[i] = inheritedClassInvariants.get(i-classInvariants.size()).getName() + " (inherited)";
-						}
-					}
-					invariantList.setItems(invariants);	
-					
-					if (methodObj.getParentClass().getFeature() != null && methodObj.getParentClass().getFeature().length() > 0 && !methodObj.getParentClass().getFeature().equals("default")) {
-						isVariational = true;
-						featureLabelText.setText(methodObj.getParentClass().getFeature());
-					}
-				}
-				if (isVariational) {
-					// update compositionTechnique
-					if ((((CbCFormulaImpl) bo).getCompositionTechnique()).toString().equals("CONJUNCTIVE_CONTRACTING")) {
-						compositionTechniqueLabelText.setText("Conjunctive Contract Refinement");
-					} else if ((((CbCFormulaImpl) bo).getCompositionTechnique()).toString()
-							.equals("EXPLICIT_CONTRACTING")) {
-						compositionTechniqueLabelText.setText("Explicit Contracting");
-					} else if ((((CbCFormulaImpl) bo).getCompositionTechnique()).toString().equals("CONTRACT_OVERRIDING")) {
-						compositionTechniqueLabelText.setText("Contract Overriding");
-					}
-				} else {
-					featureLabel.dispose();
-					featureLabelText.dispose();
-					compositionTechniqueLabel.dispose();
-					compositionTechniqueLabelText.dispose();
-				}
-			}
-		});
-	}
-	
-	public CbCFormula getFormula(AbstractStatement statement) {
-		if (statement.getParent() != null) {
-			return getFormula(statement.getParent());
-		}
-		EObject parent = statement.eContainer();
-		if (parent != null && parent instanceof AbstractStatement) {
-			return getFormula((AbstractStatement) parent);
-		} else if (parent != null && parent instanceof CbCFormula) {
-			return (CbCFormula) parent;
-		}
-		return null;
-	}
-}
\ No newline at end of file
diff --git a/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/propertiesview/CodeReaderSection.java.orig b/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/propertiesview/CodeReaderSection.java.orig
deleted file mode 100644
index 95e7d3e30..000000000
--- a/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/propertiesview/CodeReaderSection.java.orig
+++ /dev/null
@@ -1,384 +0,0 @@
-package de.tu_bs.cs.isf.cbc.tool.propertiesview;
-
-<<<<<<< HEAD
-=======
-import java.util.ArrayList;
-import java.util.List;
-
->>>>>>> master
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.graphiti.mm.pictograms.PictogramElement;
-import org.eclipse.graphiti.ui.platform.GFPropertySection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StyleRange;
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Device;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-<<<<<<< HEAD
-import org.eclipse.swt.widgets.List;
-=======
->>>>>>> master
-import org.eclipse.ui.views.properties.tabbed.ITabbedPropertyConstants;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
-
-import de.tu_bs.cs.isf.cbc.cbcmodel.AbstractStatement;
-<<<<<<< HEAD
-import de.tu_bs.cs.isf.cbc.cbcmodel.CbCFormula;
-import de.tu_bs.cs.isf.cbc.cbcmodel.Condition;
-import de.tu_bs.cs.isf.cbc.cbcmodel.GlobalConditions;
-import de.tu_bs.cs.isf.cbc.tool.diagram.CbCDiagramTypeProvider;
-import de.tu_bs.cs.isf.cbc.tool.helper.Predicate;
-import de.tu_bs.cs.isf.cbc.tool.helper.PredicateDefinition;
-import de.tu_bs.cs.isf.cbc.tool.helper.UpdateConditionsOfChildren;
-import de.tu_bs.cs.isf.cbc.tool.helper.UpdateContractsToProve;
-import de.tu_bs.cs.isf.cbc.tool.helper.UpdateMethodCallsToProve;
-import de.tu_bs.cs.isf.cbc.tool.helper.UpdateOriginalCallsToProve;
-import de.tu_bs.cs.isf.cbc.util.FileUtil;
-=======
-import de.tu_bs.cs.isf.cbc.cbcmodel.Condition;
-import de.tu_bs.cs.isf.cbc.tool.diagram.CbCDiagramTypeProvider;
-import de.tu_bs.cs.isf.cbc.tool.helper.UpdateContractsToProve;
-import de.tu_bs.cs.isf.cbc.tool.helper.UpdateMethodCallsToProve;
-import de.tu_bs.cs.isf.cbc.tool.helper.UpdateOriginalCallsToProve;
-import de.tu_bs.cs.isf.cbc.util.UpdateConditionsOfChildren;
->>>>>>> master
-
-/**
- * Class for the Code-Reader-Tab of the Properties-View. Formats CorC-Code to
- * formatted, editable code and translates it back to CorC-Diagram.
- * 
- * @author David
- */
-public class CodeReaderSection extends GFPropertySection implements ITabbedPropertyConstants {
-
-<<<<<<< HEAD
-=======
-	final List<Button> buttons = new ArrayList<Button>();
->>>>>>> master
-	// Defining the logical properties
-	private Composite parent;
-	private TabbedPropertySheetPage tabbedPropertySheetPage;
-	private Display display;
-	
-	private Device device = Display.getCurrent ();
-	private Color white = new Color (device, 255, 255, 255);
-
-	private Object bo;
-	
-	// Defining the UI properties
-	private StyledText codeText;
-	private Label codeLabel;
-
-<<<<<<< HEAD
-	private Label predicateLabel;
-	private static List predicatesList;	
-	
-=======
->>>>>>> master
-	private Label actionLabel;
-	private Button saveButton;
-
-
-	@Override
-	public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
-		super.createControls(parent, tabbedPropertySheetPage);
-		this.parent = parent;
-		this.tabbedPropertySheetPage = tabbedPropertySheetPage;
-
-		TabbedPropertySheetWidgetFactory factory = getWidgetFactory();
-
-		Composite composite = factory.createFlatFormComposite(parent);
-
-		display = Display.getCurrent();
-
-		GridLayout gridLayout = new GridLayout();
-		gridLayout.numColumns = 2;
-		gridLayout.verticalSpacing = 20;
-		composite.setLayout(gridLayout);
-
-		codeLabel = new Label(composite, SWT.PUSH);
-		codeLabel.setText("Code: ");
-		codeLabel.setBackground(white);
-
-		codeText = new StyledText(composite, SWT.WRAP | SWT.PUSH | SWT.BORDER);
-		GridData outputGridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-		outputGridData.widthHint = 800;
-		codeText.setText("Choose a code block");
-		codeText.setLayoutData(outputGridData);
-		codeText.setBackground(white);
-<<<<<<< HEAD
-		
-		predicateLabel = new Label(composite, SWT.PUSH);
-		predicateLabel.setText("Available predicates: ");
-		predicateLabel.setBackground(white);
-		
-		GridData gridData_list_predicates = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL);
-		
-		gridData_list_predicates.horizontalAlignment = GridData.FILL;
-		predicatesList = new List(composite, SWT.MULTI | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
-		updateList();
-		gridData_list_predicates.heightHint = predicatesList.computeTrim(0, 0, 0, predicatesList.getItemHeight() * 5).height;
-		predicatesList.setLayoutData(gridData_list_predicates);
-=======
->>>>>>> master
-
-		actionLabel = new Label(composite, SWT.PUSH);
-		actionLabel.setText("Action: ");
-		actionLabel.setBackground(white);
-		
-		// generateButton
-		saveButton = new Button(composite, SWT.PUSH);
-		saveButton.setText("Save");
-		saveButton.setEnabled(false);
-
-		saveButton.addListener(SWT.Selection, new Listener() {
-			@Override
-			public void handleEvent(Event e) {
-				TransactionalEditingDomain domain = TransactionUtil.getEditingDomain(bo);
-				domain.getCommandStack().execute(new RecordingCommand(domain) {
-					@Override
-					protected void doExecute() {
-						String text = codeText.getText();
-						text = text.replaceAll("\n", "");
-						text = text.replaceAll("\t", "");
-						if (bo instanceof Condition) {
-							((Condition) bo).setName(text);
-							UpdateConditionsOfChildren.updateConditionsofChildren((Condition) bo);
-							UpdateOriginalCallsToProve.updateOriginalCallsToProve((Condition) bo); //varcorcXFeatureIDE
-							UpdateMethodCallsToProve.updateMethodCallsToProve((Condition) bo);//varcorcXFeatureIDE
-							UpdateContractsToProve.updateContractsToProve((Condition) bo);//varcorcXFeatureIDE
-						} else if (bo instanceof AbstractStatement) {
-							((AbstractStatement) bo).setName(text);
-							((AbstractStatement) bo).setProven(false);
-							;
-						}
-					}
-				});
-			}
-		});
-	}
-
-<<<<<<< HEAD
-	private void updateList() {
-		if (bo == null) return;
-		AbstractStatement stmt = null;
-		if (bo instanceof Condition) {
-			Condition cond = ((Condition) bo);
-			if (cond.eContainer() instanceof GlobalConditions) return; 
-			stmt = (AbstractStatement) cond.eContainer();
-		} else if (bo instanceof AbstractStatement) {
-			stmt = (AbstractStatement) bo;
-		} else if (bo instanceof CbCFormula) {
-			stmt = ((CbCFormula) bo).getStatement();
-		} else {
-			predicatesList.removeAll();
-			predicatesList.add("Select a condition");
-			return;
-		}
-		while (!(stmt.eContainer() instanceof CbCFormula)) {
-			stmt = (AbstractStatement) stmt.eContainer();
-		}
-		FileUtil fu = new FileUtil(stmt.eResource().getURI().toPlatformString(true));
-		CbCFormula formula = (CbCFormula) stmt.eContainer();
-		String path = fu.getLocationString(stmt.eResource().getURI().toPlatformString(true));
-		if (formula.getMethodObj() == null || formula.getMethodObj().getParentClass() == null || formula.getMethodObj().getParentClass().getFeature() == null || formula.getMethodObj().getParentClass().getFeature().equals("default")) {
-			path = path.substring(0, path.indexOf("/src/")) + "/predicates.def";
-		} else {
-			path = path.substring(0, path.indexOf("/features/")) + "/predicates.def";
-		}
-		java.util.List<Predicate> readPredicates = fu.readPredicates(path);
-		java.util.List<String> availablePreds = new java.util.ArrayList<String>();
-		if (readPredicates != null) {
-			for (Predicate p : readPredicates) {
-				for (PredicateDefinition pDef : p.definitions) {
-					availablePreds.add(p.getSignature(true) + (p.definitions.size() > 1 ? (": " + pDef.name) : ""));
-				}
-			}
-		}
-		String[] items = new String[availablePreds.size()];
-		for (int i = 0; i < availablePreds.size(); i++) {
-			items[i] = availablePreds.get(i);
-		}
-		predicatesList.setItems(items);
-	}
-
-=======
->>>>>>> master
-	@Override
-	public void refresh() {
-		CbCDiagramTypeProvider test = new CbCDiagramTypeProvider();
-		PictogramElement pe = getSelectedPictogramElement();
-		bo = test.getFeatureProvider().getBusinessObjectForPictogramElement(pe);
-		if ((bo instanceof Condition) || (bo instanceof AbstractStatement)) {
-			String text = "";
-			if (bo instanceof Condition) {
-				text = formateCode(((Condition) bo).getName());
-			} else if (bo instanceof AbstractStatement) {
-				text = generateCode2(((AbstractStatement) bo).getName());
-			}
-			codeText.setText(text);
-			codeText.setEditable(true);
-			saveButton.setEnabled(true);
-			styleText(codeText, display);
-			parent.pack();
-			tabbedPropertySheetPage.resizeScrolledComposite();
-		} else {
-			codeText.setText("Choose a code block");
-			codeText.setEditable(false);
-			saveButton.setEnabled(false);
-			parent.pack();
-			tabbedPropertySheetPage.resizeScrolledComposite();
-		}
-<<<<<<< HEAD
-		updateList();
-=======
->>>>>>> master
-	}
-
-	/**
-	 * Method for highlighting of key-words.
-	 */
-	public static void styleText(StyledText codeText, Display display) {
-		String[] lines = codeText.getText().split("\\n");
-		String keyWord1 = "forall";
-		String keyWord2 = "exists";
-		Color blue = display.getSystemColor(SWT.COLOR_BLUE);
-		Color green = display.getSystemColor(SWT.COLOR_DARK_GREEN);
-		Color black = display.getSystemColor(SWT.COLOR_BLACK);
-		int offset = 0;
-		for (String line : lines) {
-			int index1 = line.indexOf(keyWord1);
-			int index2 = line.indexOf(keyWord2);
-			if (index1 != -1) {
-				StyleRange range = new StyleRange(index1 + offset, keyWord1.length(), blue, null, SWT.BOLD);
-				codeText.setStyleRange(range);
-			}
-			if (index2 != -1) {
-				StyleRange range = new StyleRange(index2 + offset, keyWord2.length(), green, null, SWT.BOLD);
-				codeText.setStyleRange(range);
-			}
-			// The next two for loops are for marking ->,&,| if they are first or last char
-			boolean firstChar = true;
-			for (int i = 0; i < line.length(); i++) {
-				if (line.charAt(i) == '&' || line.charAt(i) == '|') {
-					if (firstChar) {
-						StyleRange range = new StyleRange(i + offset, 1, black, null, SWT.BOLD);
-						codeText.setStyleRange(range);
-					}
-				} else if (line.charAt(i) == '-' && line.charAt(i + 1) == '>') {
-					if (firstChar) {
-						StyleRange range = new StyleRange(i + offset, 2, black, null, SWT.BOLD);
-						codeText.setStyleRange(range);
-					}
-				} else if (line.charAt(i) == ' ') {
-				} else {
-					firstChar = false;
-				}
-			}
-			boolean lastChar = true;
-			for (int i = line.length() - 1; i > 0; i--) {
-				if (line.charAt(i) == '&' || line.charAt(i) == '|') {
-					if (lastChar) {
-						StyleRange range = new StyleRange(i + offset, 1, black, null, SWT.BOLD);
-						codeText.setStyleRange(range);
-					}
-				} else if (line.charAt(i) == '>' && line.charAt(i - 1) == '-') {
-					if (lastChar) {
-						StyleRange range = new StyleRange(i - 1 + offset, 2, black, null, SWT.BOLD);
-						codeText.setStyleRange(range);
-					}
-				} else if (line.charAt(i) == ' ') {
-
-				} else {
-					lastChar = false;
-				}
-			}
-			offset += line.length() + 1; // +1 for the newline character
-		}
-	}
-
-	/**
-	 * Method to format condition-code.
-	 */
-	public static String formateCode(String unformatted) {
-		unformatted = unformatted.replaceAll("\n", "");
-		unformatted = unformatted.replaceAll("\r", "");
-		String formatted = "";
-		int bracketCounter = 0;
-		// flag for tracking last char != '(' || ')'
-		boolean noBracket = false;
-		// flag for tracking last char == ')'
-		boolean closeBracket = false;
-		for (int i = 0; i < unformatted.length(); i++) {
-			if (unformatted.charAt(i) == '(') {
-				// To avoid newline before first char
-				if (i != 0) {
-					formatted += "\n";
-				}
-				for (int j = 0; j < bracketCounter; j++) {
-					formatted += "\t";
-				}
-				formatted += "(";
-				bracketCounter++;
-			} else if (unformatted.charAt(i) == ')') {
-				closeBracket = true;
-				if (noBracket == true) {
-					formatted += "\n";
-				}
-				bracketCounter--;
-				for (int j = 0; j < bracketCounter; j++) {
-					formatted += "\t";
-				}
-				formatted += ")";
-				// To avoid newline after last char
-				if (i != unformatted.length() - 1) {
-					formatted += "\n";
-				}
-				noBracket = false;
-			} else {
-				noBracket = true;
-				if (closeBracket == true) {
-					for (int j = 0; j < bracketCounter; j++) {
-						formatted += "\t";
-					}
-					formatted += unformatted.charAt(i);
-				} else {
-					formatted += unformatted.charAt(i);
-				}
-				closeBracket = false;
-			}
-		}
-		return formatted;
-	}
-
-	/**
-	 * Method to format statement-code.
-	 */
-	public static String generateCode2(String unformatted) {
-		String formatted = "";
-		unformatted = unformatted.replaceAll("\n", "");
-		unformatted = unformatted.replaceAll("\r", "");
-		for (int i = 0; i < unformatted.length(); i++) {
-			if (unformatted.charAt(i) == ';') {
-				formatted += unformatted.charAt(i);
-				if (i != unformatted.length() - 1) {
-					formatted = formatted + "\n";
-				}
-			} else {
-				formatted = formatted + unformatted.charAt(i);
-			}
-		}
-		return formatted;
-	}
-}
diff --git a/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/propertiesview/FeatureModel.java.orig b/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/propertiesview/FeatureModel.java.orig
deleted file mode 100644
index 2c2906f78..000000000
--- a/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/propertiesview/FeatureModel.java.orig
+++ /dev/null
@@ -1,236 +0,0 @@
-package de.tu_bs.cs.isf.cbc.tool.propertiesview;
-
-import java.io.File;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-
-import de.ovgu.featureide.fm.core.analysis.cnf.CNF;
-import de.ovgu.featureide.fm.core.analysis.cnf.LiteralSet;
-import de.ovgu.featureide.fm.core.analysis.cnf.formula.FeatureModelFormula;
-import de.ovgu.featureide.fm.core.analysis.cnf.generator.configuration.AConfigurationGenerator;
-import de.ovgu.featureide.fm.core.analysis.cnf.generator.configuration.AllConfigurationGenerator;
-import de.ovgu.featureide.fm.core.base.IFeatureModel;
-import de.ovgu.featureide.fm.core.io.manager.FeatureModelManager;
-
-/**
- * Class for managing all feature-model based informations. Generates
- * configurations.
- * 
- * @author David
- */
-public class FeatureModel {
-	private String feature;
-	private IFeatureModel featModel;
-	private Path path;
-	private List<ArrayList<String>> allConfigList = new ArrayList<ArrayList<String>>();
-	private IPath projectPath;
-	private List<String> originalFeatureNames = new ArrayList<String>();
-	private List<String> methodFeatureNames = new ArrayList<String>();
-
-	public FeatureModel(String feature) {
-		this.feature = feature;
-		loadFeatureModel();
-	}
-
-	/**
-	 * Loads the Feature-Model
-	 */
-	private void loadFeatureModel() {
-		IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-		IWorkbenchPage activePage = window.getActivePage();
-		IEditorPart activeEditor = activePage.getActiveEditor();
-		IEditorInput input = activeEditor.getEditorInput();
-		IResource diagramResource = input.getAdapter(IResource.class);
-		IResource projectResource = diagramResource.getParent().getParent().getParent().getParent();
-		projectPath = projectResource.getLocation();
-		IPath modelPath = projectPath.append("model.xml");
-		IFile modelFile = ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(modelPath);
-		path = Paths.get(modelFile.getLocationURI());
-		this.featModel = FeatureModelManager.load(path);
-	}
-
-	/**
-	 * Calculates all possible Configurations
-	 */
-	public void calculateAllConfigs() throws Exception {
-		FeatureModelFormula fm = new FeatureModelFormula(featModel);
-		CNF cnf = new CNF(fm.getCNF());
-		AConfigurationGenerator config = new AllConfigurationGenerator(cnf);
-		List<LiteralSet> literalSet = config.analyze(null);
-		for (int i = 0; i < literalSet.size(); i++) {
-			ArrayList<String> aConfigList = new ArrayList<String>();
-			for (int j = 0; j < literalSet.get(i).size(); j++) {
-				if (literalSet.get(i).getLiterals()[j] > 0) {
-					if (!featModel.getFeature(cnf.getVariables().getName(literalSet.get(i).getLiterals()[j]))
-							.getStructure().isAbstract()) {
-						aConfigList.add(cnf.getVariables().getName(literalSet.get(i).getLiterals()[j]));
-					}
-				}
-			}
-			allConfigList.add(aConfigList);
-		}
-	}
-
-	public List<ArrayList<String>> getAllConfigs() {
-		return allConfigList;
-	}
-
-	/**
-	 * Method for returning all Configs based on the selection-filter
-	 */
-	public List<String> getConfigs(List<String> selectedFeatures) {
-		List<String> configList = new ArrayList<String>();
-		if (allConfigList.isEmpty()) {
-			try {
-				calculateAllConfigs();
-			} catch (Exception e1) {
-				// TODO Auto-generated catch block
-				e1.printStackTrace();
-			}
-		}
-		for (int i = 0; i < allConfigList.size(); i++) {
-			if (allConfigList.get(i).containsAll(selectedFeatures)) {
-				configList.add(allConfigList.get(i).toString());
-			}
-		}
-		Collections.sort(configList, Comparator.comparing(String::length));
-		return configList;
-	}
-
-	/**
-	 * Method for returning all valid Replacements based on the selection-filter and
-	 * based on the replacement type
-	 */
-	public List<String> getFeatureConfigs(List<String> selectedFeatures, String replacementType) {
-		List<String> featureNames = new ArrayList<String>();
-		if (replacementType.equals("original")) {
-			featureNames = originalFeatureNames;
-		} else if (replacementType.equals("method")) {
-			featureNames = methodFeatureNames;
-		}
-		List<String> featureConfigList = new ArrayList<String>();
-		if (allConfigList.isEmpty()) {
-			try {
-				calculateAllConfigs();
-			} catch (Exception e1) {
-				// TODO Auto-generated catch block
-				e1.printStackTrace();
-			}
-		}
-		for (int i = 0; i < allConfigList.size(); i++) {
-			// List featureNames contains elements included in allConfigList.get(i)
-			if (!Collections.disjoint(featureNames, allConfigList.get(i))) {
-				if (allConfigList.get(i).containsAll(selectedFeatures) && allConfigList.get(i).contains(feature)) {
-					// throw out all irreleavnt features without manipulating allConfigList
-					List<String> filteredConfigList = new ArrayList<String>();
-					filteredConfigList.addAll(allConfigList.get(i));
-					filteredConfigList.retainAll(featureNames);
-					// No duplicate configs
-					if (!featureConfigList.contains(filteredConfigList.toString())) {
-						featureConfigList.add(filteredConfigList.toString());
-					}
-				}
-			}
-		}
-		Collections.sort(featureConfigList, Comparator.comparing(String::length));
-		return featureConfigList;
-	}
-
-	public List<String> getAllFeatureNames() {
-		return featModel.getFeatureOrderList();
-	}
-
-	/**
-	 * Method for returning all Features which could be in valid Replacements of
-	 * original-call
-	 */
-<<<<<<< HEAD
-	public List<String> getOriginalFeatureNames(String methodName) {
-=======
-	public List<String> getOriginalFeatureNames(String methodName, String className) {
->>>>>>> master
-		methodName = methodName.substring(0, 1).toUpperCase() + methodName.substring(1);
-		methodName += ".diagram";
-		for (int i = 0; i < featModel.getFeatureOrderList().size(); i++) {
-			if (featModel.getFeatureOrderList().get(i).equals(feature)) {
-				break;
-			}
-			// Add all features, which implement the method
-			IPath methodPath = projectPath.append("features");
-			IPath methodPath2 = methodPath.append(featModel.getFeatureOrderList().get(i));
-<<<<<<< HEAD
-			IPath methodPath3 = methodPath2.append("diagram");
-=======
-			IPath methodPath3 = methodPath2.append(className);
->>>>>>> master
-			IPath methodPath4 = methodPath3.append(methodName);
-			File tmpDir = new File(methodPath4.toString());
-			if (tmpDir.exists()) {
-				if (!originalFeatureNames.contains(featModel.getFeatureOrderList().get(i))) {
-					originalFeatureNames.add(featModel.getFeatureOrderList().get(i));
-				}
-			}
-		}
-		return originalFeatureNames;
-	}
-
-	/**
-	 * Method for returning all Features which could be in valid Replacements of
-	 * method-call
-	 */
-<<<<<<< HEAD
-	public List<String> getMethodFeatureNames(String code) {
-=======
-	public List<String> getMethodFeatureNames(String code, String className) {
->>>>>>> master
-		methodFeatureNames.clear();
-		code = code.replaceAll("\n", "");
-		code = code.replaceAll("\r", "");
-		String methodCut = code.substring(0, code.indexOf("("));
-		String methodName = "";
-		for (int i = 0; i < methodCut.length(); i++) {
-			if (methodCut.charAt(i) == '=' || methodCut.charAt(i) == ' ') {
-				methodName = "";
-			} else {
-				methodName += methodCut.charAt(i);
-			}
-		}
-		// Manipulate MethodName
-		methodName = methodName.substring(0, 1).toUpperCase() + methodName.substring(1);
-		methodName += ".diagram";
-
-		System.out.println(featModel.getFeatureOrderList());
-		// add Features which has the method implemented
-		for (int i = 0; i < featModel.getFeatureOrderList().size(); i++) {
-			IPath methodPath = projectPath.append("features");
-			IPath methodPath2 = methodPath.append(featModel.getFeatureOrderList().get(i));
-<<<<<<< HEAD
-			IPath methodPath3 = methodPath2.append("diagram");
-=======
-			IPath methodPath3 = methodPath2.append(className);
->>>>>>> master
-			IPath methodPath4 = methodPath3.append(methodName);
-			File tmpDir = new File(methodPath4.toString());
-			if (tmpDir.exists()) {
-				if (!methodFeatureNames.contains(featModel.getFeatureOrderList().get(i))) {
-					methodFeatureNames.add(featModel.getFeatureOrderList().get(i));
-				}
-			}
-		}
-		return methodFeatureNames;
-	}
-}
diff --git a/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/propertiesview/IFbCFilter.java.orig b/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/propertiesview/IFbCFilter.java.orig
deleted file mode 100644
index eddbd1660..000000000
--- a/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/propertiesview/IFbCFilter.java.orig
+++ /dev/null
@@ -1,28 +0,0 @@
-package de.tu_bs.cs.isf.cbc.tool.propertiesview;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.graphiti.mm.pictograms.PictogramElement;
-import org.eclipse.graphiti.services.Graphiti;
-import org.eclipse.graphiti.ui.platform.AbstractPropertySectionFilter;
-
-import de.tu_bs.cs.isf.cbc.cbcmodel.AbstractStatement;
-import de.tu_bs.cs.isf.cbc.cbcmodel.CbCFormula;
-
-/**
- * Class to filter for statements
- * @author Tobias
- *
- */
-public class IFbCFilter extends AbstractPropertySectionFilter {
-
-	@Override
-    protected boolean accept(PictogramElement pe) {
-        EObject eObject =
-            Graphiti.getLinkService()
-            .getBusinessObjectForLinkedPictogramElement(pe);
-        if (eObject instanceof AbstractStatement || eObject instanceof CbCFormula) {
-            return true;
-        }
-        return false;
-    }
-}
diff --git a/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/propertiesview/InheritanceSection.java.orig b/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/propertiesview/InheritanceSection.java.orig
deleted file mode 100644
index 32da5da47..000000000
--- a/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/propertiesview/InheritanceSection.java.orig
+++ /dev/null
@@ -1,134 +0,0 @@
-package de.tu_bs.cs.isf.cbc.tool.propertiesview;
-
-
-import org.eclipse.graphiti.mm.pictograms.PictogramElement;
-import org.eclipse.graphiti.ui.platform.GFPropertySection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Device;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.views.properties.tabbed.ITabbedPropertyConstants;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
-
-<<<<<<< HEAD
-import de.tu_bs.cs.isf.cbc.cbcclass.model.cbcclass.Method;
-import de.tu_bs.cs.isf.cbc.cbcclass.model.cbcclass.ModelClass;
-=======
-import de.tu_bs.cs.isf.cbc.cbcclass.Method;
-import de.tu_bs.cs.isf.cbc.cbcclass.ModelClass;
->>>>>>> master
-import de.tu_bs.cs.isf.cbc.cbcmodel.CbCFormula;
-import de.tu_bs.cs.isf.cbc.cbcmodel.Condition;
-import de.tu_bs.cs.isf.cbc.cbcmodel.impl.CbCFormulaImpl;
-import de.tu_bs.cs.isf.cbc.tool.diagram.CbCDiagramTypeProvider;
-
-public class InheritanceSection extends GFPropertySection implements ITabbedPropertyConstants {
-	
-	private Composite parent;
-	private TabbedPropertySheetPage tabbedPropertySheetPage;
-	private Display display;
-	
-	// Defining the UI properties
-	private Label inheritanceLabel;
-	private Label inheritanceLabelText;
-	
-	private Label preLabel;
-	private StyledText preCode;
-	private Label postLabel;
-	private StyledText postCode;
-
-	
-	private Object bo;
-
-	@Override
-	public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
-		super.createControls(parent, tabbedPropertySheetPage);
-		this.parent = parent;
-		this.tabbedPropertySheetPage = tabbedPropertySheetPage;
-		
-		Device device = Display.getCurrent();
-		display = Display.getCurrent();
-		TabbedPropertySheetWidgetFactory factory = getWidgetFactory();
-
-		Composite composite = factory.createFlatFormComposite(parent);
-		
-		// Defining GridLayout for properties-view
-		GridLayout gridLayout = new GridLayout();
-		gridLayout.numColumns = 2;
-		gridLayout.verticalSpacing = 20;
-		composite.setLayout(gridLayout);
-		Color white = new Color (device, 255, 255, 255);
-		
-		inheritanceLabel = new Label(composite, SWT.PUSH);
-		inheritanceLabel.setBackground(white);
-		inheritanceLabel.setText("");
-		
-		inheritanceLabelText = new Label(composite, SWT.PUSH);
-		inheritanceLabelText.setBackground(white);
-		inheritanceLabelText.setText("");
-		
-		preLabel = new Label(composite, SWT.PUSH);
-		preLabel.setBackground(white);
-		preLabel.setText("Precondition (or): ");
-		
-		preCode = new StyledText(composite, SWT.WRAP | SWT.PUSH | SWT.BORDER);
-		GridData preOutputGridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-		preOutputGridData.widthHint = 800;
-		preCode.setText("There is no other contract that needs to be considered!");
-		preCode.setLayoutData(preOutputGridData);
-		preCode.setBackground(white);
-		preCode.setEditable(false);
-		
-		postLabel = new Label(composite, SWT.PUSH);
-		postLabel.setBackground(white);
-		postLabel.setText("Postcondition (and): ");
-		
-		postCode = new StyledText(composite, SWT.WRAP | SWT.PUSH | SWT.BORDER);
-		GridData postOutputGridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-		postOutputGridData.widthHint = 800;
-		postCode.setText("There is no other contract that needs to be considered!");
-		postCode.setLayoutData(postOutputGridData);
-		postCode.setBackground(white);
-		postCode.setEditable(false);
-	}
-
-	@Override
-	public void refresh() {
-		CbCDiagramTypeProvider diagramProvider = new CbCDiagramTypeProvider();
-		PictogramElement pe = getSelectedPictogramElement();
-		bo = diagramProvider.getFeatureProvider().getBusinessObjectForPictogramElement(pe);
-		if(bo instanceof CbCFormulaImpl) {
-			CbCFormula formula = ((CbCFormula) bo);
-			ModelClass mc = (ModelClass) formula.getMethodObj().eContainer();
-			Condition pre = null;
-			Condition post = null;
-			if (mc.getInheritsFrom() != null) {
-				for (Method m : mc.getInheritsFrom().getMethods()) {
-					if (m.getName().equals(formula.getMethodName())) {
-						pre = m.getCbcStartTriple().getStatement().getPreCondition();
-						post = m.getCbcStartTriple().getStatement().getPostCondition();
-					}
-				}
-				if (pre != null && post != null) {
-					inheritanceLabelText.setText("This method has a super-implementation in the class " + mc.getInheritsFrom().getName() + ".\nPlease note that the inherited conditions are attached to the conditions of this method. \nThe inherited precondition is attached with \"or\" ( | ), the postcondition is attached with \"and\" ( && ) due to the Liskov Substitution Principle.");
-					preCode.setText(CodeReaderSection.formateCode(pre.getName()));
-					CodeReaderSection.styleText(preCode, display);
-					postCode.setText(CodeReaderSection.formateCode(post.getName()));
-					CodeReaderSection.styleText(postCode, display);
-				} else {
-					inheritanceLabelText.setText("This method has no super-implementation in the class " + mc.getInheritsFrom().getName() + ".");
-				}
-				parent.pack();
-				tabbedPropertySheetPage.resizeScrolledComposite();
-			} else {
-				inheritanceLabelText.setText("No inheritance for this class.");
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/propertiesview/ReplacementsSection.java.orig b/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/propertiesview/ReplacementsSection.java.orig
deleted file mode 100644
index 5c0a1e6f5..000000000
--- a/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/propertiesview/ReplacementsSection.java.orig
+++ /dev/null
@@ -1,315 +0,0 @@
-package de.tu_bs.cs.isf.cbc.tool.propertiesview;
-
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IResource;
-<<<<<<< HEAD
-=======
-import org.eclipse.emf.ecore.EObject;
->>>>>>> master
-import org.eclipse.graphiti.mm.pictograms.PictogramElement;
-import org.eclipse.graphiti.ui.platform.GFPropertySection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Device;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.views.properties.tabbed.ITabbedPropertyConstants;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
-
-<<<<<<< HEAD
-=======
-import de.tu_bs.cs.isf.cbc.cbcmodel.CbCFormula;
->>>>>>> master
-import de.tu_bs.cs.isf.cbc.cbcmodel.impl.MethodStatementImpl;
-import de.tu_bs.cs.isf.cbc.cbcmodel.impl.OriginalStatementImpl;
-import de.tu_bs.cs.isf.cbc.tool.diagram.CbCDiagramTypeProvider;
-
-/**
- * Class for the Replacements-Tab of the Properties-View. Filter and shows valid
-<<<<<<< HEAD
- * replacements of an original-call or mehtod call in the product line.
-=======
- * replacements of an original-call or method call in the product line.
->>>>>>> master
- * 
- * @author David
- */
-public class ReplacementsSection extends GFPropertySection implements ITabbedPropertyConstants {
-
-	final List<Button> buttons = new ArrayList<Button>();
-	// Defining the logical properties
-	private Composite parent;
-	private TabbedPropertySheetPage tabbedPropertySheetPage;
-	private String currentFeature;
-	private FeatureModel featureModel;
-	private List<String> configs = new ArrayList<String>();
-	private String outputFormat = "";
-	private List<String> originalFeatureNames = new ArrayList<String>();
-	private List<String> methodFeatureNames = new ArrayList<String>();
-	
-	private Device device = Display.getCurrent ();
-	private Color white = new Color (device, 255, 255, 255);
-
-	// Defining the UI properties
-	private Label replacementLabel;
-	private Text replacementText;
-
-	private Label filterLabel;
-	private Group buttonGroup;
-
-	private Label generationLabel;
-	private Button generateButton;
-	private Image buttonImage;
-
-	private Label outputLabel;
-	private Text outputText;
-
-	private Label noProductLineLabel;
-
-	@Override
-	public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
-		super.createControls(parent, tabbedPropertySheetPage);
-
-		this.parent = parent;
-		this.tabbedPropertySheetPage = tabbedPropertySheetPage;
-		TabbedPropertySheetWidgetFactory factory = getWidgetFactory();
-		
-		Composite composite = factory.createFlatFormComposite(parent);
-		
-		// Defining GridLayout for properties-view
-		GridLayout gridLayout = new GridLayout();
-		gridLayout.numColumns = 2;
-		gridLayout.verticalSpacing = 20;
-		composite.setLayout(gridLayout);
-		
-		currentFeature = getCurrentFeature();
-		if(currentFeature.contentEquals("")) {
-			noProductLineLabel = new Label(composite, SWT.PUSH);
-			noProductLineLabel.setText("This view is only available for diagrams representing a software product line.");
-			noProductLineLabel.setBackground(white);
-			return;
-		}
-		featureModel = new FeatureModel(currentFeature);
-<<<<<<< HEAD
-		originalFeatureNames = featureModel.getOriginalFeatureNames(getCurrentMethod());
-=======
-		originalFeatureNames = featureModel.getOriginalFeatureNames(getCurrentMethod(), getCurrentClass());
->>>>>>> master
-
-		// replacementLabel
-		replacementLabel = new Label(composite, SWT.PUSH);
-		replacementLabel.setText("Replacement type: ");
-		replacementLabel.setBackground(white);
-
-		// replacementText
-		replacementText = new Text(composite, SWT.WRAP | SWT.PUSH | SWT.BORDER);
-		GridData replacementTextGridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-		replacementText.setText("");
-		replacementText.setLayoutData(replacementTextGridData);
-		replacementText.setBackground(white);
-
-		// filterLabel
-		filterLabel = new Label(composite, SWT.PUSH);
-		filterLabel.setText("Filter: ");
-		filterLabel.setBackground(white);
-
-		// buttonGroup
-		buttonGroup = new Group(composite, SWT.PUSH);
-		buttonGroup.setText("Features");
-		GridLayout buttonGroupLayout = new GridLayout();
-		buttonGroupLayout.numColumns = 6;
-		buttonGroup.setLayout(buttonGroupLayout);
-		buttonGroup.setBackground(white);
-
-		// generationLabel
-		generationLabel = new Label(composite, SWT.PUSH);
-		generationLabel.setText("Generation: ");
-		generationLabel.setBackground(white);
-
-		// buttonImage
-		InputStream input = ConfigurationsSection.class.getResourceAsStream("generate16.png");
-		buttonImage = new Image(null, input);
-
-		// generateButton
-		generateButton = new Button(composite, SWT.PUSH);
-		generateButton.setImage(buttonImage);
-		generateButton.setText("Generate");
-		generateButton.setEnabled(false);
-		generateButton.setBackground(white);
-
-		// outputLabel
-		outputLabel = new Label(composite, SWT.PUSH);
-		outputLabel.setText("Output: ");
-		outputLabel.setBackground(white);
-
-		// outputText
-		outputText = new Text(composite, SWT.WRAP | SWT.PUSH | SWT.BORDER);
-		GridData outputGridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-		outputText.setText("");
-		outputText.setLayoutData(outputGridData);
-		outputText.setBackground(white);
-
-		// Listener for generateButton
-		generateButton.addListener(SWT.Selection, new Listener() {
-			@Override
-			public void handleEvent(Event e) {
-				List<String> selectedFeatures = new ArrayList<String>();
-				// iterate over saved buttons
-				for (Button button : buttons) {
-					if (button.getSelection() == true) {
-						selectedFeatures.add(button.getText());
-					}
-				}
-				if (replacementText.getText().equals("Original-Call")) {
-//					configs = featureModel.getFeatureConfigsOriginal(selectedFeatures);
-					configs = featureModel.getFeatureConfigs(selectedFeatures, "original");
-				} else if (replacementText.getText().equals("Method-Call")) {
-					configs = featureModel.getFeatureConfigs(selectedFeatures, "method");
-				}
-				outputFormat = "";
-				for (int d = 0; d < configs.size(); d++) {
-					if (d == configs.size() - 1) {
-						outputFormat = outputFormat + "Configuration<" + (d + 1) + ">:" + configs.get(d);
-					} else {
-						outputFormat = outputFormat + "Configuration<" + (d + 1) + ">:" + configs.get(d) + "\n";
-					}
-				}
-				if (configs.isEmpty()) {
-					outputText.setText("No available Configuration");
-				} else {
-					outputText.setText(outputFormat);
-				}
-				parent.pack();
-				tabbedPropertySheetPage.resizeScrolledComposite();
-			}
-		});
-	}
-
-	@Override
-	public void refresh() {
-		if(currentFeature.contentEquals("")) {
-			return;
-		}
-		CbCDiagramTypeProvider test = new CbCDiagramTypeProvider();
-		PictogramElement pe = getSelectedPictogramElement();
-		Object bo = test.getFeatureProvider().getBusinessObjectForPictogramElement(pe);
-		if (bo instanceof OriginalStatementImpl) {
-			for (Control kid : buttonGroup.getChildren()) {
-				kid.dispose();
-			}
-			buttons.clear();
-			outputText.setText("");
-			replacementText.setText("Original-Call");
-			if (originalFeatureNames.isEmpty()) {
-				generateButton.setEnabled(false);
-				Label hint = new Label(buttonGroup, SWT.PUSH);
-				hint.setText("No Features available because of smallest feature with current method");
-			} else {
-				generateButton.setEnabled(true);
-				for (int i = 0; i < originalFeatureNames.size(); i++) {
-					Button newButton = new Button(buttonGroup, SWT.CHECK);
-					newButton.setText(originalFeatureNames.get(i));
-					newButton.setBackground(white);
-					buttons.add(newButton);
-				}
-			}
-		}
-		// MethodStatement
-		else if (bo instanceof MethodStatementImpl) {
-			for (Control kid : buttonGroup.getChildren()) {
-				kid.dispose();
-			}
-			buttons.clear();
-			outputText.setText("");
-			replacementText.setText("Method-Call");
-<<<<<<< HEAD
-			methodFeatureNames = featureModel.getMethodFeatureNames(((MethodStatementImpl) bo).getName());
-=======
-			EObject tmpObj = ((MethodStatementImpl) bo).eContainer();
-			while (!(tmpObj.eContainer() instanceof CbCFormula)) {
-				tmpObj = tmpObj.eContainer();
-			}
-			methodFeatureNames = featureModel.getMethodFeatureNames(((MethodStatementImpl) bo).getName(), ((CbCFormula) tmpObj.eContainer()).getClassName());
->>>>>>> master
-			if (methodFeatureNames.isEmpty()) {
-				generateButton.setEnabled(false);
-				Label hint = new Label(buttonGroup, SWT.PUSH);
-				hint.setText("No method replacement found");
-			} else {
-				generateButton.setEnabled(true);
-				for (int i = 0; i < methodFeatureNames.size(); i++) {
-					Button newButton = new Button(buttonGroup, SWT.CHECK);
-					newButton.setText(methodFeatureNames.get(i));
-					buttons.add(newButton);
-				}
-			}
-		}
-		// Other Elements
-		else {
-			buttons.clear();
-			for (Control kid : buttonGroup.getChildren()) {
-				kid.dispose();
-			}
-			generateButton.setEnabled(false);
-			replacementText.setText("No valid replacement type");
-			outputText.setText("");
-		}
-		buttonGroup.layout();
-		parent.pack();
-		tabbedPropertySheetPage.resizeScrolledComposite();
-	}
-
-	public String getCurrentFeature() {
-		IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-		IWorkbenchPage activePage = window.getActivePage();
-		IEditorPart activeEditor = activePage.getActiveEditor();
-		IEditorInput input = activeEditor.getEditorInput();
-		IResource diagramResource = input.getAdapter(IResource.class);
-<<<<<<< HEAD
-		IResource featureResource = diagramResource.getParent().getParent(); // ->diagramFolder->featureFolder
-=======
-		IResource featureResource = diagramResource.getParent().getParent();
-		return featureResource.getName();
-	}
-	
-	public String getCurrentClass() {
-		IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-		IWorkbenchPage activePage = window.getActivePage();
-		IEditorPart activeEditor = activePage.getActiveEditor();
-		IEditorInput input = activeEditor.getEditorInput();
-		IResource diagramResource = input.getAdapter(IResource.class);
-		IResource featureResource = diagramResource.getParent();
->>>>>>> master
-		return featureResource.getName();
-	}
-
-	public String getCurrentMethod() {
-		IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-		IWorkbenchPage activePage = window.getActivePage();
-		IEditorPart activeEditor = activePage.getActiveEditor();
-		IEditorInput input = activeEditor.getEditorInput();
-		IResource diagramResource = input.getAdapter(IResource.class);
-		; // ->diagramFolder->featureFolder
-		String diagramName = diagramResource.getName().replaceFirst("[.][^.]+$", ""); // remove File extension
-		return diagramName;
-	}
-}
diff --git a/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/propertiesview/VariableFilter.java.orig b/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/propertiesview/VariableFilter.java.orig
deleted file mode 100644
index fc95d0c6f..000000000
--- a/de.tu-bs.cs.isf.cbc.tool/src/de/tu_bs/cs/isf/cbc/tool/propertiesview/VariableFilter.java.orig
+++ /dev/null
@@ -1,27 +0,0 @@
-package de.tu_bs.cs.isf.cbc.tool.propertiesview;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.graphiti.mm.pictograms.PictogramElement;
-import org.eclipse.graphiti.services.Graphiti;
-import org.eclipse.graphiti.ui.platform.AbstractPropertySectionFilter;
-
-import de.tu_bs.cs.isf.cbc.cbcmodel.JavaVariables;
-
-/**
- * Class to filter for statements
- * @author Tobias
- *
- */
-public class VariableFilter extends AbstractPropertySectionFilter {
-
-	@Override
-    protected boolean accept(PictogramElement pe) {
-        EObject eObject =
-            Graphiti.getLinkService()
-            .getBusinessObjectForLinkedPictogramElement(pe);
-        if (eObject instanceof JavaVariables) {
-            return true;
-        }
-        return false;
-    }
-}
diff --git a/de.tu-bs.cs.isf.cbc.util/.classpath.orig b/de.tu-bs.cs.isf.cbc.util/.classpath.orig
deleted file mode 100644
index b2e8d69bf..000000000
--- a/de.tu-bs.cs.isf.cbc.util/.classpath.orig
+++ /dev/null
@@ -1,36 +0,0 @@
-<<<<<<< HEAD
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
-		<attributes>
-			<attribute name="module" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="lib" path="lib/antlr-3.4.jar"/>
-	<classpathentry kind="lib" path="lib/de.ovgu.featureide.lib.fm-v3.6.2.jar"/>
-	<classpathentry kind="lib" path="lib/org.sat4j.core.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
-=======
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
-		<attributes>
-			<attribute name="module" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="lib" path="lib/antlr-3.4.jar"/>
-	<classpathentry kind="lib" path="lib/de.ovgu.featureide.lib.fm-v3.6.2.jar"/>
-	<classpathentry kind="lib" path="lib/org.sat4j.core.jar"/>
-	<classpathentry kind="lib" path="lib/junit-4.13.2.jar"/>
-	<classpathentry kind="lib" path="lib/junit-jupiter-api-5.9.1.jar"/>
-	<classpathentry kind="lib" path="lib/junit-platform-commons-1.9.1.jar"/>
-	<classpathentry kind="lib" path="lib/mockito-core-4.8.1.jar"/>
-	<classpathentry kind="lib" path="lib/mockito-inline-4.8.1.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
->>>>>>> master
diff --git a/de.tu-bs.cs.isf.cbc.util/META-INF/MANIFEST.MF.orig b/de.tu-bs.cs.isf.cbc.util/META-INF/MANIFEST.MF.orig
deleted file mode 100644
index 2dd347022..000000000
--- a/de.tu-bs.cs.isf.cbc.util/META-INF/MANIFEST.MF.orig
+++ /dev/null
@@ -1,47 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Parser
-Bundle-SymbolicName: de.tu-bs.cs.isf.cbc.util
-Bundle-Version: 1.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-16
-Require-Bundle: org.key_project.core,
- org.key_project.util,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.graphiti.mm,
- org.eclipse.core.filesystem,
- org.eclipse.ui,
- org.eclipse.ui.console,
- org.emftext.language.java,
- org.key_project.ui,
-<<<<<<< HEAD
- de.tu_bs.cs.isf.cbc.statistics,
- com.google.guava
-Export-Package: de.tu_bs.cs.isf.cbc.util
-Import-Package: com.google.common.collect;version="10.0.1",
- de.tu_bs.cs.isf.cbc.tool.helper,
- de.tu_bs.cs.isf.corc.predicateWizard,
- helper,
-=======
- com.google.guava,
- org.mockito.mockito-core;bundle-version="4.8.1";resolution:=optional,
- org.junit;bundle-version="4.13.2",
- org.junit.jupiter.api;bundle-version="5.9.1";resolution:=optional,
- org.junit.platform.commons;bundle-version="1.9.1";resolution:=optional,
- org.eclipse.graphiti.ui,
- de.tu_bs.cs.isf.cbc.statistics,
- de.tu-bs.cs.isf.cbc.model,
- de.tu-bs.cs.isf.cbc.exceptions,
- org.eclipse.graphiti;bundle-version="0.18.0"
-Export-Package: de.tu_bs.cs.isf.cbc.util,
- de.tu_bs.cs.isf.cbc.util.conditionparser,
- de.tu_bs.cs.isf.cbc.util.consts,
- de.tu_bs.cs.isf.cbc.util.diagnostics,
- de.tu_bs.cs.isf.cbc.util.statistics
-Import-Package: org.eclipse.emf.ecore.xmi.impl;version="2.35.0",
->>>>>>> master
- org.emftext.language.java.resource.java.util
-Bundle-ClassPath: lib/antlr-3.4.jar,
- lib/de.ovgu.featureide.lib.fm-v3.6.2.jar,
- lib/org.sat4j.core.jar,
- .
diff --git a/de.tu-bs.cs.isf.cbcclass.tool/META-INF/MANIFEST.MF.orig b/de.tu-bs.cs.isf.cbcclass.tool/META-INF/MANIFEST.MF.orig
deleted file mode 100644
index 6724008ce..000000000
--- a/de.tu-bs.cs.isf.cbcclass.tool/META-INF/MANIFEST.MF.orig
+++ /dev/null
@@ -1,40 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: ClassTool
-Bundle-SymbolicName: de.tu-bs.cs.isf.cbcclass.tool; singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Automatic-Module-Name: de.tu.bs.cs.isf.cbcclass.tool
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.graphiti,
- org.eclipse.graphiti.ui,
-<<<<<<< HEAD
- de.tu_bs.cs.isf.cbc.cbcclass.model,
-=======
->>>>>>> master
- de.tu-bs.cs.isf.cbc.model,
- org.eclipse.emf.common,
- org.eclipse.graphiti.mm,
- org.eclipse.swt,
- org.eclipse.emf.transaction,
- org.eclipse.ui.workbench,
- org.eclipse.ui.views.properties.tabbed
-Import-Package: de.tu_bs.cs.isf.cbc.tool.diagram,
- de.tu_bs.cs.isf.cbc.tool.features,
- de.tu_bs.cs.isf.cbc.tool.helper,
-<<<<<<< HEAD
- de.tu_bs.cs.isf.cbc.tool.model,
-=======
->>>>>>> master
- de.tu_bs.cs.isf.cbc.tool.patterns,
- de.tu_bs.cs.isf.cbc.util,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.emf.ecore.xmi.impl,
- org.eclipse.graphiti.pattern;version="0.13.2",
- org.eclipse.graphiti.pattern.id
-<<<<<<< HEAD
-Export-Package: de.tu_bs.cs.isf.cbcclass.tool.patterns,
- helper
-=======
-Export-Package: de.tu_bs.cs.isf.cbcclass.tool.patterns
->>>>>>> master
diff --git a/de.tu-bs.cs.isf.cbcclass.tool/build.properties.orig b/de.tu-bs.cs.isf.cbcclass.tool/build.properties.orig
deleted file mode 100644
index 34d2e4d2d..000000000
--- a/de.tu-bs.cs.isf.cbcclass.tool/build.properties.orig
+++ /dev/null
@@ -1,4 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .
diff --git a/de.tu-bs.cs.isf.cbcclass.tool/plugin.xml.orig b/de.tu-bs.cs.isf.cbcclass.tool/plugin.xml.orig
deleted file mode 100644
index 03169ccf3..000000000
--- a/de.tu-bs.cs.isf.cbcclass.tool/plugin.xml.orig
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-   <extension
-         point="org.eclipse.graphiti.ui.diagramTypes">
-      <diagramType
-            id="de.tu-bs.cs.isf.cbcclass.tool.diagramType"
-            name="CbC Class Diagram"
-            type="cbcclass">
-      </diagramType>
-   </extension>
-   <extension
-         point="org.eclipse.graphiti.ui.diagramTypeProviders">
-      <diagramTypeProvider
-            class="de.tu_bs.cs.isf.cbcclass.tool.diagram.CbCClassDiagramTypeProvider"
-            context="org.eclipse.graphiti.ui.diagramEditor"
-            id="de.tu-bs.cs.isf.cbcclass.tool.CbCClassDiagramTypeProvider"
-            name="CbC Class Diagram Type Provider">
-         <diagramType
-               id="de.tu-bs.cs.isf.cbcclass.tool.diagramType">
-         </diagramType>
-<<<<<<< HEAD
-         <imageProvider
-               id="de.tu-bs.cs.isf.cbcclass.tool.imageProvider">
-         </imageProvider>
-      </diagramTypeProvider>
-   </extension>
-   <extension
-         point="org.eclipse.graphiti.ui.imageProviders">
-      <imageProvider
-            class="de.tu_bs.cs.isf.cbcclass.tool.diagram.CbCClassImageProvider"
-            id="de.tu-bs.cs.isf.cbcclass.tool.imageProvider">
-      </imageProvider>
-   </extension>
-   <extension
-=======
-      </diagramTypeProvider>
-   </extension>
-   <extension
->>>>>>> master
-    point="org.eclipse.ui.views.properties.tabbed.propertyContributor">
-    <propertyContributor contributorId="cbcclass.PropertyContributor">
-        <propertyCategory category="Graphiti">
-        </propertyCategory>
-    </propertyContributor>
-</extension>
-
-<extension
-      point="org.eclipse.ui.views.properties.tabbed.propertyTabs">
-   <propertyTabs
-          contributorId="cbcclass.PropertyContributor">
-    <propertyTab
-         category="Graphiti"
-         id="Basics"
-         label="Basics">
-    </propertyTab>
-   </propertyTabs>
-</extension>
-<extension
-      point="org.eclipse.ui.views.properties.tabbed.propertySections">
-    <propertySections
-          contributorId="cbcclass.PropertyContributor">
-        <propertySection
-              class="de.tu_bs.cs.isf.cbcclass.tool.propertiesview.BasicsSection"
-<<<<<<< HEAD
-              filter="de.tu_bs.cs.isf.cbcclass.tool.propertiesview.PictogramFilter"
-=======
-              filter="de.tu_bs.cs.isf.cbc.util.filters.PictogramFilter"
->>>>>>> master
-              id="Basics"
-              tab="Basics">
-        </propertySection>
-    </propertySections>
-</extension>
-
-</plugin>
diff --git a/de.tu-bs.cs.isf.cbcclass.tool/src/de/tu_bs/cs/isf/cbcclass/tool/features/RenameMethodClassFeature.java.orig b/de.tu-bs.cs.isf.cbcclass.tool/src/de/tu_bs/cs/isf/cbcclass/tool/features/RenameMethodClassFeature.java.orig
deleted file mode 100644
index 38f89d2dc..000000000
--- a/de.tu-bs.cs.isf.cbcclass.tool/src/de/tu_bs/cs/isf/cbcclass/tool/features/RenameMethodClassFeature.java.orig
+++ /dev/null
@@ -1,73 +0,0 @@
-package de.tu_bs.cs.isf.cbcclass.tool.features;
-
-import org.eclipse.graphiti.features.IDirectEditingInfo;
-import org.eclipse.graphiti.features.IFeatureProvider;
-import org.eclipse.graphiti.features.context.ICustomContext;
-import org.eclipse.graphiti.features.custom.AbstractCustomFeature;
-import org.eclipse.graphiti.mm.pictograms.PictogramElement;
-
-<<<<<<< HEAD
-import de.tu_bs.cs.isf.cbc.cbcclass.model.cbcclass.Method;
-=======
-import de.tu_bs.cs.isf.cbc.cbcclass.Method;
->>>>>>> master
-
-public class RenameMethodClassFeature extends AbstractCustomFeature{
-
-	/**
-	 * boolean that indicate if something changes
-	 */
-    private boolean hasDoneChanges = false;
-    
-    /**
-     * Constructor of the class
-     * @param fp	The FeatureProvider
-     */
-	public RenameMethodClassFeature(IFeatureProvider fp) {
-		super(fp);
-	}
-
-	@Override
-    public String getName() {
-        return "Edit Signature of a Class Method";
-    }
- 
-    @Override
-    public String getDescription() {
-        return "Edit Signature of a Class Method";
-    }
-    
-    @Override
-    public boolean canExecute(ICustomContext context) {
-        boolean ret = false;
-        PictogramElement[] pes = context.getPictogramElements();
-        if (pes != null && pes.length == 1) {
-            Object bo = getBusinessObjectForPictogramElement(pes[0]);
-            if (bo instanceof Method) {
-                ret = true;
-            }
-        }
-        return ret;
-    }
-    
-	@Override
-	public void execute(ICustomContext context) {
-        PictogramElement[] pes = context.getPictogramElements();
-        if (pes != null && pes.length == 1) {
-            Object bo = getBusinessObjectForPictogramElement(pes[0]);
-            if (bo instanceof Method) {
-            	IDirectEditingInfo directEditingInfo = getFeatureProvider().getDirectEditingInfo();
-    			directEditingInfo.setMainPictogramElement(pes[0]);
-    			directEditingInfo.setPictogramElement(pes[0]);
-    			directEditingInfo.setGraphicsAlgorithm(pes[0].getGraphicsAlgorithm());
-    			directEditingInfo.setActive(true);
-            	getFeatureProvider().getDiagramTypeProvider().getDiagramBehavior().refresh();
-            }
-        }	
-	}
-	
-	@Override
-    public boolean hasDoneChanges() {
-        return this.hasDoneChanges;
-    }
-}
diff --git a/de.tu-bs.cs.isf.cbcclass.tool/src/de/tu_bs/cs/isf/cbcclass/tool/features/RenameModelClassInheritanceFeature.java.orig b/de.tu-bs.cs.isf.cbcclass.tool/src/de/tu_bs/cs/isf/cbcclass/tool/features/RenameModelClassInheritanceFeature.java.orig
deleted file mode 100644
index 8d214f979..000000000
--- a/de.tu-bs.cs.isf.cbcclass.tool/src/de/tu_bs/cs/isf/cbcclass/tool/features/RenameModelClassInheritanceFeature.java.orig
+++ /dev/null
@@ -1,73 +0,0 @@
-package de.tu_bs.cs.isf.cbcclass.tool.features;
-
-import org.eclipse.graphiti.features.IDirectEditingInfo;
-import org.eclipse.graphiti.features.IFeatureProvider;
-import org.eclipse.graphiti.features.context.ICustomContext;
-import org.eclipse.graphiti.features.custom.AbstractCustomFeature;
-import org.eclipse.graphiti.mm.pictograms.PictogramElement;
-
-<<<<<<< HEAD
-import de.tu_bs.cs.isf.cbc.cbcclass.model.cbcclass.ModelClass;
-=======
-import de.tu_bs.cs.isf.cbc.cbcclass.ModelClass;
->>>>>>> master
-
-public class RenameModelClassInheritanceFeature extends AbstractCustomFeature{
-
-	/**
-	 * boolean that indicate if something changes
-	 */
-    private boolean hasDoneChanges = false;
-    
-    /**
-     * Constructor of the class
-     * @param fp	The FeatureProvider
-     */
-	public RenameModelClassInheritanceFeature(IFeatureProvider fp) {
-		super(fp);
-	}
-
-	@Override
-    public String getName() {
-        return "Edit Inheritance of Model Class";
-    }
- 
-    @Override
-    public String getDescription() {
-        return "Edit Inheritance of a Model Class";
-    }
-    
-    @Override
-    public boolean canExecute(ICustomContext context) {
-        boolean ret = false;
-        PictogramElement[] pes = context.getPictogramElements();
-        if (pes != null && pes.length == 1) {
-            Object bo = getBusinessObjectForPictogramElement(pes[0]);
-            if (bo instanceof ModelClass) {
-                ret = true;
-            }
-        }
-        return ret;
-    }
-    
-	@Override
-	public void execute(ICustomContext context) {
-        PictogramElement[] pes = context.getPictogramElements();
-        if (pes != null && pes.length == 1) {
-            Object bo = getBusinessObjectForPictogramElement(pes[0]);
-            if (bo instanceof ModelClass) {
-            	IDirectEditingInfo directEditingInfo = getFeatureProvider().getDirectEditingInfo();
-    			directEditingInfo.setMainPictogramElement(pes[0]);
-    			directEditingInfo.setPictogramElement(pes[0]);
-    			directEditingInfo.setGraphicsAlgorithm(pes[0].getGraphicsAlgorithm());
-    			directEditingInfo.setActive(true);
-            	getFeatureProvider().getDiagramTypeProvider().getDiagramBehavior().refresh();
-            }
-        }	
-	}
-	
-	@Override
-    public boolean hasDoneChanges() {
-        return this.hasDoneChanges;
-    }
-}
\ No newline at end of file
diff --git a/de.tu-bs.cs.isf.cbcclass.tool/src/de/tu_bs/cs/isf/cbcclass/tool/features/RenameVariableFeature.java.orig b/de.tu-bs.cs.isf.cbcclass.tool/src/de/tu_bs/cs/isf/cbcclass/tool/features/RenameVariableFeature.java.orig
deleted file mode 100644
index dc7ccd1e8..000000000
--- a/de.tu-bs.cs.isf.cbcclass.tool/src/de/tu_bs/cs/isf/cbcclass/tool/features/RenameVariableFeature.java.orig
+++ /dev/null
@@ -1,75 +0,0 @@
-package de.tu_bs.cs.isf.cbcclass.tool.features;
-
-import org.eclipse.graphiti.features.IDirectEditingInfo;
-import org.eclipse.graphiti.features.IFeatureProvider;
-import org.eclipse.graphiti.features.context.ICustomContext;
-import org.eclipse.graphiti.features.custom.AbstractCustomFeature;
-import org.eclipse.graphiti.mm.pictograms.PictogramElement;
-
-<<<<<<< HEAD
-import de.tu_bs.cs.isf.cbc.cbcclass.model.cbcclass.Field;
-=======
-import de.tu_bs.cs.isf.cbc.cbcclass.Field;
->>>>>>> master
-import de.tu_bs.cs.isf.cbc.cbcmodel.JavaVariable;
-
-public class RenameVariableFeature extends AbstractCustomFeature {
-	
-	/**
-	 * boolean that indicate if something changes
-	 */
-    private boolean hasDoneChanges = false;
-    
-    /**
-     * Constructor of the class
-     * @param fp	The FeatureProvider
-     */
-    public RenameVariableFeature(IFeatureProvider fp) {
-        super(fp);
-    }
- 
-    @Override
-    public String getName() {
-        return "Edit Name of a Variable";
-    }
- 
-    @Override
-    public String getDescription() {
-        return "Edit Name of a Variable";
-    }
- 
-    @Override
-    public boolean canExecute(ICustomContext context) {
-        boolean ret = false;
-        PictogramElement[] pes = context.getPictogramElements();
-        if (pes != null && pes.length == 1) {
-            Object bo = getBusinessObjectForPictogramElement(pes[0]);
-            if (bo instanceof JavaVariable || bo instanceof Field) {
-                ret = true;
-            }
-        }
-        return ret;
-    }
- 
-    @Override
-    public void execute(ICustomContext context) {
-        PictogramElement[] pes = context.getPictogramElements();
-        if (pes != null && pes.length == 1) {
-            Object bo = getBusinessObjectForPictogramElement(pes[0]);
-            if (bo instanceof JavaVariable || bo instanceof Field) {
-            	IDirectEditingInfo directEditingInfo = getFeatureProvider().getDirectEditingInfo();
-    			directEditingInfo.setMainPictogramElement(pes[0]);
-    			directEditingInfo.setPictogramElement(pes[0]);
-    			directEditingInfo.setGraphicsAlgorithm(pes[0].getGraphicsAlgorithm());
-    			directEditingInfo.setActive(true);
-
-            	getFeatureProvider().getDiagramTypeProvider().getDiagramBehavior().refresh();
-            }
-        }
-    }
- 
-    @Override
-    public boolean hasDoneChanges() {
-           return this.hasDoneChanges;
-    }
-}
\ No newline at end of file
diff --git a/de.tu-bs.cs.isf.cbcclass.tool/src/de/tu_bs/cs/isf/cbcclass/tool/patterns/ConnectionPattern.java.orig b/de.tu-bs.cs.isf.cbcclass.tool/src/de/tu_bs/cs/isf/cbcclass/tool/patterns/ConnectionPattern.java.orig
deleted file mode 100644
index 3c2b855fe..000000000
--- a/de.tu-bs.cs.isf.cbcclass.tool/src/de/tu_bs/cs/isf/cbcclass/tool/patterns/ConnectionPattern.java.orig
+++ /dev/null
@@ -1,136 +0,0 @@
-package de.tu_bs.cs.isf.cbcclass.tool.patterns;
-
-import org.eclipse.graphiti.features.context.IAddConnectionContext;
-import org.eclipse.graphiti.features.context.IAddContext;
-import org.eclipse.graphiti.features.context.ICreateConnectionContext;
-import org.eclipse.graphiti.features.context.impl.AddConnectionContext;
-import org.eclipse.graphiti.mm.GraphicsAlgorithmContainer;
-import org.eclipse.graphiti.mm.algorithms.Polyline;
-import org.eclipse.graphiti.mm.pictograms.Anchor;
-import org.eclipse.graphiti.mm.pictograms.Connection;
-import org.eclipse.graphiti.mm.pictograms.ConnectionDecorator;
-import org.eclipse.graphiti.mm.pictograms.ContainerShape;
-import org.eclipse.graphiti.mm.pictograms.PictogramElement;
-import org.eclipse.graphiti.mm.pictograms.Shape;
-import org.eclipse.graphiti.pattern.AbstractConnectionPattern;
-import org.eclipse.graphiti.services.Graphiti;
-import org.eclipse.graphiti.services.IGaService;
-import org.eclipse.graphiti.services.IPeCreateService;
-import org.eclipse.graphiti.util.IColorConstant;
-
-<<<<<<< HEAD
-import de.tu_bs.cs.isf.cbc.cbcclass.model.cbcclass.impl.MethodImpl;
-import de.tu_bs.cs.isf.cbc.cbcclass.model.cbcclass.impl.ModelClassImpl;
-=======
-import de.tu_bs.cs.isf.cbc.cbcclass.impl.MethodImpl;
-import de.tu_bs.cs.isf.cbc.cbcclass.impl.ModelClassImpl;
->>>>>>> master
-
-/**
- * Class that creates the graphical representation of the parent hierarchy between Algorithms
- * @author Tobias
- *
- */
-public class ConnectionPattern extends AbstractConnectionPattern {
-	
-	@Override
-	public String getCreateName() {
-		return "Refinement";
-	}
-	
-	@Override
-	public String getCreateDescription() {
-		return "Firstly, select the class, then the method.";
-	}
-
-	@Override
-	public boolean canAdd(IAddContext context) {
-		return context instanceof IAddConnectionContext;
-	}
-
-	@Override
-	public PictogramElement add(IAddContext context) {
-		IAddConnectionContext addConContext = (IAddConnectionContext) context;
-		IPeCreateService peCreateService = Graphiti.getPeCreateService();
-		IGaService gaService = Graphiti.getGaService();
-
-		Connection connection = peCreateService.createFreeFormConnection(getDiagram());
-		connection.setStart(addConContext.getSourceAnchor());
-		connection.setEnd(addConContext.getTargetAnchor());
-
-		Polyline polyline = gaService.createPlainPolyline(connection);
-		polyline.setForeground(manageColor(IColorConstant.BLACK));
-
-		ConnectionDecorator cd;
-		cd = peCreateService.createConnectionDecorator(connection, false, 1.0, true);
-		createArrow(cd);
-		
-		return connection;
-	}
-
-	@Override
-	public boolean canStartConnection(ICreateConnectionContext context) {
-		// Defines the start of the connection; allowed are objects that may
-		// contain other objects
-		Object domainObject = getBusinessObjectForPictogramElement(context.getSourcePictogramElement());
-		
-		if (domainObject != null && domainObject instanceof ModelClassImpl) {
-			if (context.getSourcePictogramElement() instanceof ContainerShape) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	@Override
-	public boolean canCreate(ICreateConnectionContext context) {
-		PictogramElement sourcePictogramElement = context.getSourcePictogramElement();
-		PictogramElement targetPictogramElement = context.getTargetPictogramElement();
-
-		if (sourcePictogramElement == null || targetPictogramElement == null || targetPictogramElement.equals(getDiagram()) || !(targetPictogramElement instanceof ContainerShape)) {
-			return false;
-		}
-		
-		Object sourceDomainObject = getBusinessObjectForPictogramElement(sourcePictogramElement);
-		Object targetDomainObject = getBusinessObjectForPictogramElement(targetPictogramElement);
-
-		if (!(sourceDomainObject instanceof ModelClassImpl)) {
-			return false;
-		}
-		
-		if (!(targetDomainObject instanceof MethodImpl)) {
-			return false;
-		}
-		return true;
-	}
-
-	@Override
-	public Connection create(ICreateConnectionContext context) {
-		Anchor sourceAnchor = context.getSourceAnchor();
-		Anchor targetAnchor = context.getTargetAnchor();
-
-		if (targetAnchor == null) {
-			Shape shape = (Shape) context.getTargetPictogramElement();
-			while (shape.getAnchors().isEmpty()) {
-				shape = shape.getContainer();
-			}
-			targetAnchor = shape.getAnchors().get(0);
-		}
-
-		AddConnectionContext addContext = new AddConnectionContext(sourceAnchor, targetAnchor);
-		Connection connection = (Connection) getFeatureProvider().addIfPossible(addContext);
-		return connection;
-	}
-	
-	/**
-	 * Helper method to create an arrow at the end of the connection
-	 * @param gaContainer	the connection decorator
-	 * @return	A polyline that is formed like an arrow
-	 */
-	private Polyline createArrow(GraphicsAlgorithmContainer gaContainer) {
-		Polyline polyline = Graphiti.getGaCreateService().createPlainPolyline(gaContainer,
-				new int[] { -15, 10, 0, 0, -15, -10 });
-		polyline.setForeground(manageColor(IColorConstant.BLACK));
-		return polyline;
-	}
-}
\ No newline at end of file
diff --git a/de.tu-bs.cs.isf.cbcclass.tool/src/de/tu_bs/cs/isf/cbcclass/tool/patterns/FieldClassPattern.java.orig b/de.tu-bs.cs.isf.cbcclass.tool/src/de/tu_bs/cs/isf/cbcclass/tool/patterns/FieldClassPattern.java.orig
deleted file mode 100644
index f4458405a..000000000
--- a/de.tu-bs.cs.isf.cbcclass.tool/src/de/tu_bs/cs/isf/cbcclass/tool/patterns/FieldClassPattern.java.orig
+++ /dev/null
@@ -1,291 +0,0 @@
-package de.tu_bs.cs.isf.cbcclass.tool.patterns;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Random;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.graphiti.features.IReason;
-import org.eclipse.graphiti.features.context.IAddContext;
-import org.eclipse.graphiti.features.context.ICreateContext;
-import org.eclipse.graphiti.features.context.IDeleteContext;
-import org.eclipse.graphiti.features.context.IDirectEditingContext;
-import org.eclipse.graphiti.features.context.IRemoveContext;
-import org.eclipse.graphiti.features.impl.Reason;
-import org.eclipse.graphiti.mm.algorithms.GraphicsAlgorithm;
-import org.eclipse.graphiti.mm.algorithms.Text;
-import org.eclipse.graphiti.mm.algorithms.impl.TextImpl;
-import org.eclipse.graphiti.mm.pictograms.ContainerShape;
-import org.eclipse.graphiti.mm.pictograms.PictogramElement;
-import org.eclipse.graphiti.mm.pictograms.Shape;
-import org.eclipse.graphiti.mm.pictograms.impl.ShapeImpl;
-import org.eclipse.graphiti.pattern.IPattern;
-import org.eclipse.graphiti.pattern.id.IdLayoutContext;
-import org.eclipse.graphiti.pattern.id.IdPattern;
-import org.eclipse.graphiti.pattern.id.IdUpdateContext;
-<<<<<<< HEAD
-import de.tu_bs.cs.isf.cbc.cbcclass.model.cbcclass.CbcclassFactory;
-import de.tu_bs.cs.isf.cbc.cbcclass.model.cbcclass.Field;
-import de.tu_bs.cs.isf.cbc.cbcclass.model.cbcclass.ModelClass;
-import de.tu_bs.cs.isf.cbc.cbcclass.model.cbcclass.Visibility;
-import de.tu_bs.cs.isf.cbc.cbcmodel.JavaVariable;
-import de.tu_bs.cs.isf.cbc.util.FileUtil;
-import helper.ClassUtil;
-=======
-import de.tu_bs.cs.isf.cbc.cbcclass.CbcclassFactory;
-import de.tu_bs.cs.isf.cbc.cbcclass.Field;
-import de.tu_bs.cs.isf.cbc.cbcclass.ModelClass;
-import de.tu_bs.cs.isf.cbc.cbcclass.Visibility;
-import de.tu_bs.cs.isf.cbc.cbcmodel.JavaVariable;
-import de.tu_bs.cs.isf.cbc.util.ClassUtil;
-import de.tu_bs.cs.isf.cbc.util.FileUtil;
->>>>>>> master
-
-public class FieldClassPattern extends IdPattern implements IPattern {
-
-	private static final String ID_FIELD_TEXT = "fieldText";
-
-	public FieldClassPattern() {
-		super();
-	}
-
-	@Override
-	public String getCreateName() {
-		return "Class Field";
-	}
-
-	@Override
-	public String getCreateDescription() {
-		return "Create a class field: \n[modifier] [static] [final] type name \n[] means optional.\nExample: private final int[] number";
-	}
-
-	@Override
-	protected PictogramElement doAdd(IAddContext context) {
-		return null;
-	}
-
-	@Override
-	public boolean canCreate(ICreateContext context) {
-		return getBusinessObjectForPictogramElement(context.getTargetContainer()) instanceof ModelClass;
-	}
-
-	@Override
-	public boolean isMainBusinessObjectApplicable(Object mainBusinessObject) {
-		return mainBusinessObject instanceof Field;
-	}
-
-	public Object[] create(ICreateContext context) {
-		ModelClass modelClass = (ModelClass) getBusinessObjectForPictogramElement(context.getTargetContainer());
-		Field field = CbcclassFactory.eINSTANCE.createField();
-		field.setVisibility(Visibility.PUBLIC);
-		Random random = new Random();
-		field.setName("field" + random.nextInt(100000));
-		field.setType("int[]");
-		field.setIsFinal(false);
-		field.setIsStatic(false);
-		modelClass.getFields().add(field);
-		updatePictogramElement(context.getTargetContainer());
-		return new Object[] { field };
-	}
-
-	@Override
-	public void setValue(String value, IDirectEditingContext context) {
-		Field field = (Field) getBusinessObjectForPictogramElement(context.getPictogramElement());
-		String split[] = value.trim().split(" ");
-		int pointer = 1;
-
-		// check for visibility modifier
-		switch (split[0].toLowerCase()) {
-		case "private":
-			field.setVisibility(Visibility.PRIVATE);
-			break;
-		case "public":
-			field.setVisibility(Visibility.PUBLIC);
-			break;
-		case "protected":
-			field.setVisibility(Visibility.PROTECTED);
-			break;
-		case "package":
-			field.setVisibility(Visibility.PACKAGE);
-			break;
-		default:
-			field.setVisibility(Visibility.PUBLIC);
-			pointer = 0;
-			break;
-		}
-		// check for final and static modifier
-		if (Arrays.stream(split).anyMatch("static"::equalsIgnoreCase)) {
-			field.setIsStatic(true);
-			pointer++;
-		} else
-			field.setIsStatic(false);
-		if (Arrays.stream(split).anyMatch("final"::equalsIgnoreCase)) {
-			field.setIsFinal(true);
-			pointer++;
-		} else
-			field.setIsFinal(false);
-
-		// set type and name of field
-		field.setType(split[pointer++]);
-		field.setName(split[pointer]);
-
-		ShapeImpl shape = (ShapeImpl) context.getPictogramElement();
-		TextImpl text = (TextImpl) shape.getGraphicsAlgorithm();
-		text.setValue(field.getDisplayedName());
-		
-		// refresh project
-		URI uri = getDiagram().eResource().getURI();
-		ClassUtil.refreshProject(FileUtil.getProjectLocation(uri));
-		String path = FileUtil.getProjectLocation(uri).replace('\\', '/');
-		IProject thisProject = null;
-
-		for (IProject p : ResourcesPlugin.getWorkspace().getRoot().getProjects()) {
-			if (p.getLocation().toPortableString().equals(path) || (p.getLocation().toPortableString() + "/").equals(path)) {
-				thisProject = p;
-			}
-		}
-		try {
-			thisProject.refreshLocal(IResource.DEPTH_INFINITE, null);
-		} catch (CoreException e) {
-			e.printStackTrace();
-		}
-
-		updatePictogramElement(context.getPictogramElement());
-	}
-
-	@Override
-	public int getEditingType() {
-		return TYPE_TEXT;
-	}
-
-	public boolean canAdd(IAddContext context) {
-		return false;
-	}
-
-	@Override
-	public String checkValueValid(String value, IDirectEditingContext context) {
-		if (value == null || value.length() == 0) {
-			return "Variable must not be empty";
-		} else if (value.length() > 0 && !value.toLowerCase().matches(
-				"(public\\s|private\\s|protected\\s|)" + "(static\\s|final\\s)?" + "(final\\s|static\\s)?"
-						+ "(int|char|float|long|boolean|byte|short|double|([A-Za-z]\\w*))(\\[\\])?\\s[a-zA-Z]\\w*")) {
-			return "Field must contain a type and a name";
-		}
-
-		if (hasKeywordsAsTypeOrName(value)) {
-			return "Keywords aren't allowed as a data type or field name";
-		}
-		return null;
-	}
-
-	private boolean hasKeywordsAsTypeOrName(String value) {
-		ArrayList<String> keywords = new ArrayList<>(Arrays.asList("public", "private", "protected", "static", "final"));
-		String[] tokens = value.split(" ");
-		if (tokens.length > 1) {
-			String lastValue = tokens[tokens.length - 1].trim();
-			String penultimateValue = tokens[tokens.length - 2].trim();
-			if (keywords.contains(lastValue) || keywords.contains(penultimateValue)) {
-				return true;
-			}
-			return false;
-		}
-		return false;
-	}
-
-	@Override
-	protected boolean layout(IdLayoutContext context, String id) {
-		return false;
-	}
-
-	public boolean canUpdate(IdUpdateContext context) {
-		Object bo = getBusinessObjectForPictogramElement(context.getPictogramElement());
-		return (bo instanceof Field);
-	}
-
-	@Override
-	protected IReason updateNeeded(IdUpdateContext context, String id) {
-		Text nameText = (Text) context.getPictogramElement().getGraphicsAlgorithm();
-		Field domainObject = (Field) getBusinessObjectForPictogramElement(context.getPictogramElement());
-		if (domainObject.getName() == null || !nameText.getValue().replace(" inherited", "").equals(domainObject.getDisplayedName())) {
-			return Reason.createTrueReason("Name differs. Expected: '" + domainObject.getName() + "'");
-		}
-		return Reason.createFalseReason();
-	}
-
-	@Override
-	protected boolean update(IdUpdateContext context, String id) {
-		if (!id.equals(ID_FIELD_TEXT)) {
-			Text nameText = (Text) context.getGraphicsAlgorithm();
-			Field domainObject = (Field) context.getDomainObject();
-			nameText.setValue(domainObject.getDisplayedName());		
-			return true;
-		}
-		return false;
-	}
-
-	@Override
-	public boolean canDirectEdit(IDirectEditingContext context) {
-		Object domainObject = getBusinessObjectForPictogramElement(context.getPictogramElement());
-		GraphicsAlgorithm ga = context.getGraphicsAlgorithm();
-		if ((domainObject instanceof Field || domainObject instanceof JavaVariable) && ga instanceof Text) {
-			Field f = (Field) domainObject;
-			ModelClass mc = (ModelClass) f.eContainer();
-			if (mc.getName().equals(getDiagram().getName())) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	@Override
-	public String getInitialValue(IDirectEditingContext context) {
-		Field field = (Field) getBusinessObjectForPictogramElement(context.getPictogramElement());
-		return field.getDisplayedName();
-	}
-
-	@Override
-	public boolean canRemove(IRemoveContext context) {
-		Shape shape = (Shape) context.getPictogramElement();
-		Text text = (Text) shape.getGraphicsAlgorithm();
-		if (text.getValue().trim().endsWith("inherited") || text.getValue().trim().startsWith("PUBLIC")) {
-			return false;
-		}
-		return true;
-	}
-	
-	@Override
-	public boolean canDelete(IDeleteContext context) {
-		Shape shape = (Shape) context.getPictogramElement();
-		Text text = (Text) shape.getGraphicsAlgorithm();
-		Field f = (Field) getBusinessObjectForPictogramElement(context.getPictogramElement());
-		if (text.getValue().trim().endsWith("inherited")) {
-			return false;
-		}
-		if (!(f.eContainer() instanceof ModelClass) && text.getValue().trim().startsWith("PUBLIC")) {
-			return false;
-		}
-		return true;
-	}
-	
-	@Override
-	public void delete(IDeleteContext context) {
-		Shape shape = (Shape) context.getPictogramElement();
-		ContainerShape container = shape.getContainer();
-		
-		Field field = (Field) getBusinessObjectForPictogramElement(context.getPictogramElement());
-		if (field.eContainer() != null && field.eContainer() instanceof ModelClass) {
-			int indexToDelete = getIndex(shape.getGraphicsAlgorithm());
-			for (Shape childShape : container.getChildren()) {
-				if (getIndex(childShape.getGraphicsAlgorithm()) > indexToDelete) {
-					setIndex(childShape.getGraphicsAlgorithm(), getIndex(childShape.getGraphicsAlgorithm()) - 1);
-				}
-			}
-			super.delete(context);			
-			layoutPictogramElement(container);
-		}
-	}
-}
\ No newline at end of file
diff --git a/de.tu-bs.cs.isf.cbcclass.tool/src/de/tu_bs/cs/isf/cbcclass/tool/patterns/InvariantClassPattern.java.orig b/de.tu-bs.cs.isf.cbcclass.tool/src/de/tu_bs/cs/isf/cbcclass/tool/patterns/InvariantClassPattern.java.orig
deleted file mode 100644
index 1d614eafc..000000000
--- a/de.tu-bs.cs.isf.cbcclass.tool/src/de/tu_bs/cs/isf/cbcclass/tool/patterns/InvariantClassPattern.java.orig
+++ /dev/null
@@ -1,175 +0,0 @@
-package de.tu_bs.cs.isf.cbcclass.tool.patterns;
-
-import java.util.Random;
-
-import org.eclipse.graphiti.features.IReason;
-import org.eclipse.graphiti.features.context.IAddContext;
-import org.eclipse.graphiti.features.context.ICreateContext;
-import org.eclipse.graphiti.features.context.IDeleteContext;
-import org.eclipse.graphiti.features.context.IDirectEditingContext;
-import org.eclipse.graphiti.features.impl.Reason;
-import org.eclipse.graphiti.mm.algorithms.GraphicsAlgorithm;
-import org.eclipse.graphiti.mm.algorithms.MultiText;
-import org.eclipse.graphiti.mm.algorithms.Text;
-import org.eclipse.graphiti.mm.algorithms.impl.TextImpl;
-import org.eclipse.graphiti.mm.pictograms.PictogramElement;
-import org.eclipse.graphiti.mm.pictograms.impl.ShapeImpl;
-import org.eclipse.graphiti.pattern.IPattern;
-import org.eclipse.graphiti.pattern.id.IdLayoutContext;
-import org.eclipse.graphiti.pattern.id.IdPattern;
-import org.eclipse.graphiti.pattern.id.IdUpdateContext;
-<<<<<<< HEAD
-import de.tu_bs.cs.isf.cbc.cbcclass.model.cbcclass.ModelClass;
-=======
-import de.tu_bs.cs.isf.cbc.cbcclass.ModelClass;
->>>>>>> master
-import de.tu_bs.cs.isf.cbc.cbcmodel.CbcmodelFactory;
-import de.tu_bs.cs.isf.cbc.cbcmodel.Condition;
-import de.tu_bs.cs.isf.cbc.cbcmodel.impl.AbstractStatementImpl;
-import de.tu_bs.cs.isf.cbc.cbcmodel.impl.CompositionStatementImpl;
-import de.tu_bs.cs.isf.cbc.cbcmodel.impl.ReturnStatementImpl;
-import de.tu_bs.cs.isf.cbc.cbcmodel.impl.SkipStatementImpl;
-import de.tu_bs.cs.isf.cbc.cbcmodel.impl.StrengthWeakStatementImpl;
-
-
-public class InvariantClassPattern extends IdPattern implements IPattern {
-
-	/**
-	 * Constructor of the class
-	 */
-	public InvariantClassPattern() {
-		super();
-	}
-
-	@Override
-	public String getCreateName() {
-		return "Class Invariant";
-	}
-
-	@Override
-	public String getCreateDescription() {
-		return "Create a Class Invariant.";
-	}
-
-	@Override
-	public boolean isMainBusinessObjectApplicable(Object mainBusinessObject) {
-		return mainBusinessObject instanceof Condition;
-	}
-
-	@Override
-	public boolean canCreate(ICreateContext context) {
-		return getBusinessObjectForPictogramElement(context.getTargetContainer()) instanceof ModelClass;
-	}
-	
-	@Override
-	public Object[] create(ICreateContext context) {
-		ModelClass modelClass = (ModelClass) getBusinessObjectForPictogramElement(context.getTargetContainer());
-		Condition condition = CbcmodelFactory.eINSTANCE.createCondition();
-		Random random = new Random();
-		condition.setName("condition" + random.nextInt(10000));
-		modelClass.getClassInvariants().add(condition);		
-		updatePictogramElement(context.getTargetContainer());
-		return new Object[] { condition };
-	}
-	
-	@Override
-	public boolean canAdd(IAddContext context) {
-		return super.canAdd(context) && context.getTargetContainer() instanceof Condition;
-	}
-	
-	public PictogramElement doAdd(IAddContext context) {
-		return null;
-	}
-	
-	@Override
-	protected boolean layout(IdLayoutContext context, String id) {
-		return false;
-	}
-	
-	@Override
-	protected IReason updateNeeded(IdUpdateContext context, String id) {
-		if (context.getGraphicsAlgorithm() instanceof MultiText) {
-			MultiText nameText = (MultiText) context.getGraphicsAlgorithm();
-			Condition domainObject = (Condition) context.getDomainObject();
-			if (domainObject.getName() == null || !(domainObject.getName().equals(nameText.getValue())
-					|| nameText.getValue().equals("{" + domainObject.getName() + "}"))) {
-				return Reason.createTrueReason("Name differs. Expected: '" + domainObject.getName() + "'");
-			}
-		}
-		return Reason.createFalseReason();
-	}
-	
-	@Override
-	protected boolean update(IdUpdateContext context, String id) {
-		if (context.getGraphicsAlgorithm() instanceof MultiText) {
-			MultiText nameText = (MultiText) context.getGraphicsAlgorithm();
-			Condition domainObject = (Condition) context.getDomainObject();
-			if (domainObject.eContainer().getClass().equals(AbstractStatementImpl.class)
-					|| domainObject.eContainer().getClass().equals(SkipStatementImpl.class)
-					|| domainObject.eContainer().getClass().equals(ReturnStatementImpl.class)
-					|| domainObject.eContainer().getClass().equals(StrengthWeakStatementImpl.class)
-					|| domainObject.eContainer().getClass().equals(CompositionStatementImpl.class)) {
-				nameText.setValue("{" + domainObject.getName() + "}");
-			} else {
-				nameText.setValue(domainObject.getName());
-			}
-			return true;
-		}
-		return false;
-	}
-	
-	@Override
-	public int getEditingType() {
-	    return TYPE_TEXT;
-	}
-	
-	@Override
-	public boolean canDirectEdit(IDirectEditingContext context) {
-		Object domainObject = getBusinessObjectForPictogramElement(context.getPictogramElement());
-		GraphicsAlgorithm ga = context.getGraphicsAlgorithm();
-		if (domainObject instanceof Condition && ga instanceof Text) {
-			return true;
-		}
-		return false;
-	}
-		
-	@Override
-	public String getInitialValue(IDirectEditingContext context) {
-		Condition condition = (Condition) getBusinessObjectForPictogramElement(context.getPictogramElement());
-		return System.getProperty("line.separator") + condition.getName() + System.getProperty("line.separator");
-	}
-	
-	@Override
-	public String checkValueValid(String value, IDirectEditingContext context) {
-		if (value == null) {
-			return "Condition must not be empty";
-		}
-		if (value.length() > 0) {
-			if (value.contains("modifiable(")) {
-				String[] valueSplitted = value.split(";");
-				if (valueSplitted.length > 1
-						&& !valueSplitted[0].trim().matches("modifiable\\(\\w+[\\[\\]\\*]*(,\\w+[\\[\\]\\*]*)*\\)")) {
-					return null;// "modifiable variables must be defined as: modifiable(x,y,z,...);";
-				} else if ((value.contains("forall") || value.contains("exists"))) {
-					return null;
-				}
-			}
-		}
-		return null;
-	}
-	
-	@Override
-	public void setValue(String value, IDirectEditingContext context) {
-		Condition condition = (Condition) getBusinessObjectForPictogramElement(context.getPictogramElement());
-		condition.setName(value.trim());
-		ShapeImpl shape = (ShapeImpl)context.getPictogramElement();
-		TextImpl text = (TextImpl)shape.getGraphicsAlgorithm();
-		text.setValue(condition.getName());
-		updatePictogramElement(context.getPictogramElement());
-	}
-		
-	@Override 
-	public void delete(IDeleteContext context) {
-		super.delete(context);
-	}
-}
\ No newline at end of file
diff --git a/de.tu-bs.cs.isf.cbcclass.tool/src/de/tu_bs/cs/isf/cbcclass/tool/patterns/MethodClassPattern.java.orig b/de.tu-bs.cs.isf.cbcclass.tool/src/de/tu_bs/cs/isf/cbcclass/tool/patterns/MethodClassPattern.java.orig
deleted file mode 100644
index 9fd689880..000000000
--- a/de.tu-bs.cs.isf.cbcclass.tool/src/de/tu_bs/cs/isf/cbcclass/tool/patterns/MethodClassPattern.java.orig
+++ /dev/null
@@ -1,830 +0,0 @@
-package de.tu_bs.cs.isf.cbcclass.tool.patterns;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Predicate;
-
-import javax.swing.JOptionPane;
-
-<<<<<<< HEAD
-=======
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
->>>>>>> master
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
-import org.eclipse.graphiti.features.IReason;
-import org.eclipse.graphiti.features.context.IAddContext;
-<<<<<<< HEAD
-=======
-import org.eclipse.graphiti.features.context.IAreaContext;
->>>>>>> master
-import org.eclipse.graphiti.features.context.ICreateContext;
-import org.eclipse.graphiti.features.context.IDeleteContext;
-import org.eclipse.graphiti.features.context.IDirectEditingContext;
-import org.eclipse.graphiti.features.context.impl.DirectEditingContext;
-import org.eclipse.graphiti.features.impl.Reason;
-import org.eclipse.graphiti.mm.algorithms.GraphicsAlgorithm;
-import org.eclipse.graphiti.mm.algorithms.Image;
-import org.eclipse.graphiti.mm.algorithms.MultiText;
-import org.eclipse.graphiti.mm.algorithms.Polyline;
-import org.eclipse.graphiti.mm.algorithms.RoundedRectangle;
-import org.eclipse.graphiti.mm.algorithms.Text;
-import org.eclipse.graphiti.mm.algorithms.styles.Font;
-import org.eclipse.graphiti.mm.algorithms.styles.Orientation;
-import org.eclipse.graphiti.mm.algorithms.styles.Point;
-import org.eclipse.graphiti.mm.pictograms.ContainerShape;
-import org.eclipse.graphiti.mm.pictograms.Diagram;
-import org.eclipse.graphiti.mm.pictograms.PictogramElement;
-import org.eclipse.graphiti.mm.pictograms.Shape;
-<<<<<<< HEAD
-=======
-import org.eclipse.graphiti.mm.pictograms.impl.PictogramElementImpl;
->>>>>>> master
-import org.eclipse.graphiti.pattern.IPattern;
-import org.eclipse.graphiti.pattern.id.IdLayoutContext;
-import org.eclipse.graphiti.pattern.id.IdPattern;
-import org.eclipse.graphiti.pattern.id.IdUpdateContext;
-import org.eclipse.graphiti.services.Graphiti;
-import org.eclipse.graphiti.services.IGaService;
-import org.eclipse.graphiti.services.IPeCreateService;
-import org.eclipse.graphiti.util.IColorConstant;
-import org.eclipse.graphiti.util.PredefinedColoredAreas;
-
-<<<<<<< HEAD
-import de.tu_bs.cs.isf.cbc.cbcclass.model.cbcclass.CbcclassFactory;
-import de.tu_bs.cs.isf.cbc.cbcclass.model.cbcclass.Field;
-import de.tu_bs.cs.isf.cbc.cbcclass.model.cbcclass.Method;
-import de.tu_bs.cs.isf.cbc.cbcclass.model.cbcclass.ModelClass;
-=======
-import de.tu_bs.cs.isf.cbc.cbcclass.CbcclassFactory;
-import de.tu_bs.cs.isf.cbc.cbcclass.Field;
-import de.tu_bs.cs.isf.cbc.cbcclass.Method;
-import de.tu_bs.cs.isf.cbc.cbcclass.ModelClass;
->>>>>>> master
-import de.tu_bs.cs.isf.cbc.cbcmodel.CbCFormula;
-import de.tu_bs.cs.isf.cbc.cbcmodel.CbcmodelFactory;
-import de.tu_bs.cs.isf.cbc.cbcmodel.Condition;
-import de.tu_bs.cs.isf.cbc.cbcmodel.JavaVariable;
-import de.tu_bs.cs.isf.cbc.cbcmodel.JavaVariables;
-import de.tu_bs.cs.isf.cbc.cbcmodel.VariableKind;
-<<<<<<< HEAD
-import de.tu_bs.cs.isf.cbcclass.tool.diagram.CbCClassImageProvider;
-import de.tu_bs.cs.isf.cbc.tool.helper.GenerateDiagramFromModel;
-import de.tu_bs.cs.isf.cbc.util.FileUtil;
-import helper.ClassUtil;
-import helper.ModelClassHelper;
-import model.CbcClassUtil;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
-=======
-import de.tu_bs.cs.isf.cbcclass.tool.helper.CbcClassUtil;
-import de.tu_bs.cs.isf.cbcclass.tool.helper.ModelClassHelper;
-import de.tu_bs.cs.isf.cbc.util.ClassUtil;
-import de.tu_bs.cs.isf.cbc.util.FileUtil;
-import de.tu_bs.cs.isf.cbc.util.GenerateDiagramFromModel;
-import de.tu_bs.cs.isf.cbc.util.UpdateConditionsOfChildren;
->>>>>>> master
-
-public class MethodClassPattern extends IdPattern implements IPattern {
-
-	private static final String ID_PRE_TEXT = "preConditionText";
-	private static final String ID_POST_TEXT = "postConditionText";
-	private static final String ID_SIG_TEXT = "signatureText";
-	private static final String ID_MOD_TEXT = "modifiableText";
-	private static final String ID_MAIN_RECTANGLE = "mainRectangle";
-	private static final String ID_IMAGE_PROVEN = "imageproven";
-
-	// Header:
-	private static final String ID_PRE_HEADER = "preHeader";
-	private static final String ID_SIG_HEADER = "sigHeader";
-	private static final String ID_POST_HEADER = "postHeader";
-	private static final String ID_MOD_HEADER = "modHeader";
-
-	// lines:
-	private static final String ID_LINE_HEAD = "headerLine";
-	private static final String ID_LINE_LEFT = "leftLine";
-	private static final String ID_LINE_MID = "midLine";
-	private static final String ID_LINE_RIGHT = "rightLine";
-
-	private int width;
-	private int height;
-
-	private Resource.Factory.Registry reg = Resource.Factory.Registry.INSTANCE;
-	private Map<String, Object> m = reg.getExtensionToFactoryMap();
-	private ResourceSet rs = new ResourceSetImpl();
-
-	public MethodClassPattern() {
-		super();
-	}
-
-	@Override
-	public int getEditingType() {
-		return TYPE_TEXT;
-	}
-
-	@Override
-	public String getCreateName() {
-		return "Class Method";
-	}
-
-	@Override
-	public String getCreateDescription() {
-		return "Create a Class Method";
-	}
-
-	@Override
-	public boolean isMainBusinessObjectApplicable(Object mainBusinessObject) {
-		return mainBusinessObject instanceof Method;
-	}
-
-	@Override
-	public boolean canCreate(ICreateContext context) {
-<<<<<<< HEAD
-=======
-		if (!(context.getTargetContainer() instanceof Diagram)) {
-			return false;
-		}
->>>>>>> master
-		return true;
-	}
-
-	@Override
-	public Object[] create(ICreateContext context) {
-		String input = "";
-		boolean valid = false;
-		do {
-			input = (String) JOptionPane.showInputDialog(null, "Provide signature for new method");
-			if (input == null) {
-				return null;
-			} else if (checkValueValid(input, null) == null)
-				valid = true;
-		} while (!valid);
-
-		URI relURIdiagram = getDiagram().eResource().getURI();
-		String projectName = relURIdiagram.segment(1);
-<<<<<<< HEAD
-		String className = relURIdiagram.segment(2).equals("features") ? relURIdiagram.segment(4) : relURIdiagram.segment(2);
-=======
-		String className = relURIdiagram.segment(2).equals("features") ? relURIdiagram.segment(4) : relURIdiagram.segment(3);
->>>>>>> master
-		String featureName = relURIdiagram.segment(2).equals("features") ? relURIdiagram.segment(3) : "";
-
-		Resource cbcclassResource = ClassUtil.getClassModelResource("platform:/resource/" + projectName, className, featureName);
-		rs = cbcclassResource.getResourceSet();
-		
-<<<<<<< HEAD
-=======
-		
->>>>>>> master
-		Method method = CbcclassFactory.eINSTANCE.createMethod();
-		method.setSignature(input);
-		method.setIsStatic(input.contains(" static "));
-		
-<<<<<<< HEAD
-		Resource resource = null;
-		try {
-			resource = CbcClassUtil.getResource(getDiagram());
-		} catch (IOException | CoreException e1) {
-			e1.printStackTrace();
-		}
-		
-		for (EObject obj : resource.getContents()) {
-=======
-		Resource classResource = null;
-		try {
-			classResource = CbcClassUtil.getResource(getDiagram());
-		} catch (IOException | CoreException e1) {
-			e1.printStackTrace();
-			return null;
-		}
-		
-		for (EObject obj : classResource.getContents()) {
->>>>>>> master
-			if (obj instanceof ModelClass) {
-				method.setParentClass((ModelClass) obj);
-			}
-		}
-		
-		Resource cbcmodelResource = ClassUtil.getCbcModelResource(FileUtil.getProjectLocation(relURIdiagram), method.getName(), featureName, className);
-		boolean alreadyExisting = false;
-		if (cbcmodelResource != null) {
-			alreadyExisting = true;			
-			for (EObject obj: cbcmodelResource.getContents()) {
-				if (obj instanceof CbCFormula) {
-					CbCFormula formula = (CbCFormula) obj;
-					method.setCbcStartTriple(formula);
-					method.setCbcDiagramURI(method.getName() + ".diagram");
-					formula.setMethodObj(method);
-					formula.setClassName(className);
-					formula.setProven(false);
-				}
-			}
-		} else {
-			m.put("cbcmodel", new XMIResourceFactoryImpl());
-<<<<<<< HEAD
-			URI cbcmodelURI = URI.createPlatformResourceURI("/" + projectName + (!method.getParentClass().getFeature().equals("default") ? ("/features/" + method.getParentClass().getFeature()) : "") + "/" + className + "/" + method.getName() + ".cbcmodel", true);
-=======
-			URI cbcmodelURI = URI.createPlatformResourceURI("/" + projectName + (!method.getParentClass().getFeature().equals("default") ? ("/features/" + method.getParentClass().getFeature()) : "/src") + "/" + className + "/" + method.getName() + ".cbcmodel", true);
->>>>>>> master
-			cbcmodelResource = rs.createResource(cbcmodelURI);
-			
-			CbCFormula formula = ClassUtil.createFormula(method.getName());
-			formula.setMethodName(method.getName());
-			formula.setClassName(className);
-			formula.setProven(false);
-			formula.setMethodObj(method);
-			method.setCbcDiagramURI(method.getName() + ".diagram");
-			method.setCbcStartTriple(formula);
-			
-			cbcmodelResource.getContents().add(formula);
-		}
-		
-		ModelClassHelper.setObject(method);
-		updatePictogramElement(context.getTargetContainer());
-
-		// save class fields to cbcmodel of new method
-		JavaVariables variables = CbcmodelFactory.eINSTANCE.createJavaVariables();
-		if (alreadyExisting) {			
-			for (EObject obj : cbcmodelResource.getContents()) {
-				if (obj instanceof JavaVariables) {
-					variables = (JavaVariables) obj;
-					Predicate<JavaVariable> isParamOrReturn = (JavaVariable var) -> var.getKind().equals(VariableKind.RETURN) || var.getKind().equals(VariableKind.PARAM);
-					variables.getVariables().removeIf(isParamOrReturn);		
-				}
-			}
-		} else {
-			for (EObject obj : cbcclassResource.getContents()) {
-				if (obj instanceof ModelClass) {
-					EList<Field> fields = ((ModelClass) obj).getFields();
-					for (Field field : fields) {
-						variables.getFields().add(field);
-					}
-				}
-			}
-			cbcmodelResource.getContents().add(variables);
-		} 
-		
-		try {
-			cbcmodelResource.save(Collections.EMPTY_MAP);
-			cbcmodelResource.setTrackingModification(true);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-
-		if (!alreadyExisting) {
-			GenerateDiagramFromModel gdfm = new GenerateDiagramFromModel();
-			gdfm.execute(cbcmodelResource);
-<<<<<<< HEAD
-		}		
-		
-=======
-		}
->>>>>>> master
-		addGraphicalRepresentation(context, method);
-		ClassUtil.refreshProject(FileUtil.getProjectLocation(relURIdiagram));
-		return new Object[] { method };
-	}
-
-	@Override
-	public boolean canAdd(IAddContext context) {
-		return super.canAdd(context) && context.getTargetContainer() instanceof Diagram;
-	}
-
-	@Override
-	public boolean canDirectEdit(IDirectEditingContext context) {
-		Object domainObject = getBusinessObjectForPictogramElement(context.getPictogramElement());
-		GraphicsAlgorithm ga = context.getGraphicsAlgorithm();
-<<<<<<< HEAD
-		if ((domainObject instanceof Method) && ga instanceof RoundedRectangle) {
-=======
-		if ((domainObject instanceof Method) && (ga instanceof RoundedRectangle || ga instanceof MultiText)) {
->>>>>>> master
-			return true;
-		}
-		return false;
-	}
-
-	@Override
-	public String checkValueValid(String value, IDirectEditingContext context) {
-<<<<<<< HEAD
-		String type = "(int|char|float|long|boolean|byte|short|double|([A-Z]\\w*))(\\[\\])?";
-		if (value == null || value.length() == 0) {
-			return "Methodsignature must not be empty";
-		} else if (value.length() > 0 && !value.trim()
-				.matches("(public\\s|private\\s|protected\\s)?" + "(static\\s)?"
-						+ "((void|int|char|float|long|boolean|byte|short|double|([A-Z]\\w*))(\\[\\])?)?(\\s)?[a-z]\\w*"
-						+ "\\(" + "((" + type + "\\s[A-Za-z]\\w*,(\\s)?)*(" + type + "\\s[A-Za-z]\\w*))?" + "\\)")) {
-			return "Signature must contain a name and parentheses with optional arguments";
-=======
-		if (context == null || context.getPictogramElement() instanceof ContainerShape) {
-			String type = "(int|char|float|long|boolean|byte|short|double|([A-Z]\\w*))(\\[\\])?";
-			if (value == null || value.length() == 0) {
-				return "Methodsignature must not be empty";
-			} else if (value.length() > 0 && !value.trim()
-					.matches("(public\\s|private\\s|protected\\s)?" + "(static\\s)?"
-							+ "((void|int|char|float|long|boolean|byte|short|double|([A-Z]\\w*))(\\[\\])?)?(\\s)?[a-z]\\w*"
-							+ "\\(" + "((" + type + "\\s[A-Za-z]\\w*,(\\s)?)*(" + type + "\\s[A-Za-z]\\w*))?" + "\\)")) {
-				return "Signature must contain a name and parentheses with optional arguments";
-			}
-		} else {
-			Method method = (Method) getBusinessObjectForPictogramElement(context.getPictogramElement());
-			value = "-" + value.trim().replaceAll(" ", "").replaceAll(",", "--") + "-";
-			for (Field f : method.getParentClass().getFields()) {
-				value = value.replaceAll("-" + f.getName() + "(\\[.*\\])*-", "");
-			}
-			if (value.replaceAll("-", "").length() != 0) return "Modifiables must only contain fields of this class";
->>>>>>> master
-		}
-		return null;
-	}
-
-	@Override
-	protected PictogramElement doAdd(IAddContext context) {
-		manageColor(IColorConstant.DARK_GREEN);
-		Diagram targetDiagram = (Diagram) context.getTargetContainer();
-		Method addedMethod = (Method) context.getNewObject();
-
-		IPeCreateService peCreateService = Graphiti.getPeCreateService();
-		IGaService gaService = Graphiti.getGaService();
-
-		width = context.getWidth() <= 0 ? 600 : context.getWidth();
-		height = context.getHeight() <= 0 ? 150 : context.getHeight();
-
-		Font headerFont = gaService.manageFont(getDiagram(), "Arial", 9, false, true);
-
-		// Main contents area
-		ContainerShape outerContainerShape = peCreateService.createContainerShape(targetDiagram, true);
-		RoundedRectangle mainRectangle = gaService.createRoundedRectangle(outerContainerShape, 20, 20);
-		mainRectangle.setFilled(true);
-		gaService.setRenderingStyle(mainRectangle, PredefinedColoredAreas.getBlueWhiteAdaptions());
-		mainRectangle.setForeground(manageColor((IColorConstant.RED)));
-		mainRectangle.setLineWidth(2);
-		setId(mainRectangle, ID_MAIN_RECTANGLE);
-		gaService.setLocationAndSize(mainRectangle, context.getX(), context.getY(), width, height);
-
-		// create link and wire it
-		link(outerContainerShape, addedMethod);
-
-		// text
-		Shape preShape = peCreateService.createShape(outerContainerShape, true);
-		MultiText preText = gaService.createMultiText(preShape,
-				"{" + addedMethod.getCbcStartTriple().getStatement().getPreCondition().getName() + "}");
-		setId(preText, ID_PRE_TEXT);
-		preText.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		preText.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-
-		Shape sigShape = peCreateService.createShape(outerContainerShape, false);
-		MultiText sigText = gaService.createMultiText(sigShape, addedMethod.getSignature());
-		setId(sigText, ID_SIG_TEXT);
-		sigText.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		sigText.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-
-		Shape postShape = peCreateService.createShape(outerContainerShape, true);
-		MultiText postText = gaService.createMultiText(postShape,
-				"{" + addedMethod.getCbcStartTriple().getStatement().getPostCondition().getName() + "}");
-		setId(postText, ID_POST_TEXT);
-		postText.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		postText.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-
-<<<<<<< HEAD
-		Shape modShape = peCreateService.createShape(outerContainerShape, false);
-=======
-		Shape modShape = peCreateService.createShape(outerContainerShape, true);
->>>>>>> master
-		MultiText modText = gaService.createMultiText(modShape,
-				"{" + (addedMethod.getAssignable() == null ? "" : addedMethod.getAssignable()) + "}");
-		setId(modText, ID_MOD_TEXT);
-		modText.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		modText.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-
-		// header
-		Shape preHeader = peCreateService.createShape(outerContainerShape, false);
-		Text preTextHeader = gaService.createText(preHeader, "precondition");
-		setId(preTextHeader, ID_PRE_HEADER);
-		preTextHeader.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		preTextHeader.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		preTextHeader.setFont(headerFont);
-
-		Shape sigHeader = peCreateService.createShape(outerContainerShape, false);
-		Text sigTextHeader = gaService.createText(sigHeader, "signature");
-		setId(sigTextHeader, ID_SIG_HEADER);
-		sigTextHeader.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		sigTextHeader.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		sigTextHeader.setFont(headerFont);
-
-		Shape postHeader = peCreateService.createShape(outerContainerShape, false);
-		Text postTextHeader = gaService.createText(postHeader, "postcondition");
-		setId(postTextHeader, ID_POST_HEADER);
-		postTextHeader.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		postTextHeader.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		postTextHeader.setFont(headerFont);
-
-		Shape modHeader = peCreateService.createShape(outerContainerShape, false);
-		Text modTextHeader = gaService.createText(modHeader, "modifiable");
-		setId(modTextHeader, ID_MOD_HEADER);
-		modTextHeader.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		modTextHeader.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		modTextHeader.setFont(headerFont);
-
-		// lines
-		Shape headerShape = peCreateService.createShape(outerContainerShape, false);
-		Polyline headerline = gaService.createPolyline(headerShape);
-		setId(headerline, ID_LINE_HEAD);
-
-		Shape leftShape = peCreateService.createShape(outerContainerShape, false);
-		Polyline leftline = gaService.createPolyline(leftShape);
-		setId(leftline, ID_LINE_LEFT);
-
-		Shape midShape = peCreateService.createShape(outerContainerShape, false);
-		Polyline midline = gaService.createPolyline(midShape);
-		setId(midline, ID_LINE_MID);
-
-		Shape rightShape = peCreateService.createShape(outerContainerShape, false);
-		Polyline rightline = gaService.createPolyline(rightShape);
-		setId(rightline, ID_LINE_RIGHT);
-
-<<<<<<< HEAD
-		// proving
-		Shape proveShape = peCreateService.createShape(outerContainerShape, false);
-		Image image = gaService.createImage(proveShape, CbCClassImageProvider.IMG_UNPROVEN);
-		setId(image, ID_IMAGE_PROVEN);
-
-=======
->>>>>>> master
-		peCreateService.createChopboxAnchor(outerContainerShape);
-		peCreateService.createChopboxAnchor(postShape);
-		peCreateService.createChopboxAnchor(preShape);
-
-		link(outerContainerShape, addedMethod);
-		link(preShape, addedMethod.getCbcStartTriple().getStatement().getPreCondition());
-		link(postShape, addedMethod.getCbcStartTriple().getStatement().getPostCondition());
-		link(sigShape, addedMethod);
-		link(modShape, addedMethod);
-<<<<<<< HEAD
-		link(proveShape, addedMethod);
-=======
->>>>>>> master
-
-		return outerContainerShape;
-	}
-
-	@Override
-	protected boolean layout(IdLayoutContext context, String id) {
-		boolean changesDone = false;
-
-		GraphicsAlgorithm mainRectangle = context.getRootPictogramElement().getGraphicsAlgorithm();
-		GraphicsAlgorithm ga = context.getGraphicsAlgorithm();
-		int fourth = mainRectangle.getWidth() / 4;
-
-		if (id.equals(ID_PRE_TEXT)) {
-			Graphiti.getGaService().setLocationAndSize(ga, 0, 40, fourth, mainRectangle.getHeight() - 40);
-			changesDone = true;
-		} else if (id.equals(ID_SIG_TEXT)) {
-			Graphiti.getGaService().setLocationAndSize(ga, fourth, 40, fourth, mainRectangle.getHeight() - 40);
-			changesDone = true;
-		} else if (id.equals(ID_POST_TEXT)) {
-			Graphiti.getGaService().setLocationAndSize(ga, fourth * 2, 40, fourth, mainRectangle.getHeight() - 40);
-			changesDone = true;
-		} else if (id.equals(ID_MOD_TEXT)) {
-			Graphiti.getGaService().setLocationAndSize(ga, fourth * 3, 40, fourth, mainRectangle.getHeight() - 40);
-			changesDone = true;
-		} else if (id.equals(ID_PRE_HEADER)) {
-			Graphiti.getGaService().setLocationAndSize(ga, 0, 20, fourth, 20);
-			changesDone = true;
-		} else if (id.equals(ID_SIG_HEADER)) {
-			Graphiti.getGaService().setLocationAndSize(ga, fourth, 20, fourth, 20);
-			changesDone = true;
-		} else if (id.equals(ID_POST_HEADER)) {
-			Graphiti.getGaService().setLocationAndSize(ga, fourth * 2, 20, fourth, 20);
-			changesDone = true;
-		} else if (id.equals(ID_MOD_HEADER)) {
-			Graphiti.getGaService().setLocationAndSize(ga, fourth * 3, 20, fourth, 20);
-			changesDone = true;
-		} else if (id.equals(ID_LINE_LEFT)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService()
-					.createPointList(new int[] { fourth, 0, fourth, mainRectangle.getHeight() });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		} else if (id.equals(ID_LINE_MID)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService()
-					.createPointList(new int[] { fourth * 2, 0, fourth * 2, mainRectangle.getHeight() });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		} else if (id.equals(ID_LINE_RIGHT)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService()
-					.createPointList(new int[] { fourth * 3, 0, fourth * 3, mainRectangle.getHeight() });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		} else if (id.equals(ID_LINE_HEAD)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService()
-					.createPointList(new int[] { 0, 40, mainRectangle.getWidth(), 40 });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		}
-		return changesDone;
-	}
-
-	@Override
-	protected IReason updateNeeded(IdUpdateContext context, String id) {
-<<<<<<< HEAD
-		if (id.equals(ID_IMAGE_PROVEN)) {
-			Method domainObject = (Method) context.getDomainObject();
-			Image image = (Image) context.getGraphicsAlgorithm();
-			String path = FileUtil.getProjectLocation(getDiagram().eResource().getURI())+ "/features/" + domainObject.getParentClass().getFeature() + "/" + domainObject.getCbcStartTriple().getClassName() + "/" + domainObject.getName() + ".cbcmodel";
-=======
-		if (id.equals(ID_MAIN_RECTANGLE)) {
-			Method domainObject = (Method) context.getDomainObject();
-			RoundedRectangle rectangle = (RoundedRectangle) context.getGraphicsAlgorithm();
-			String path = FileUtil.getProjectLocation(getDiagram().eResource().getURI())+ (domainObject.getParentClass().getFeature().equals("default") ? "/src" : "/features/" + domainObject.getParentClass().getFeature()) + "/" + domainObject.getCbcStartTriple().getClassName() + "/" + domainObject.getName() + ".cbcmodel";
->>>>>>> master
-			File cbcmodelFile = new File(path);
-			if (cbcmodelFile.exists()) {
-				URI cbcmodelURI = URI.createFileURI(path);
-
-				CbCFormula read = CbcClassUtil.readFormula(cbcmodelURI);
-<<<<<<< HEAD
-				if (read.isProven() && image.getId().equals(CbCClassImageProvider.IMG_UNPROVEN)) {
-					return Reason.createTrueReason("Statement is proven. Expected green color.");
-				} else if (!read.isProven() && image.getId().equals(CbCClassImageProvider.IMG_PROVEN)) {
-=======
-				if (read.isProven() && (rectangle.getForeground() != null
-						&& !rectangle.getForeground().equals(manageColor(IColorConstant.DARK_GREEN)))) {
-					return Reason.createTrueReason("Statement is proven. Expected green color.");
-				} else if (!read.isProven() && (rectangle.getForeground() != null
-						&& !rectangle.getForeground().equals(manageColor(IColorConstant.RED)))) {
->>>>>>> master
-					return Reason.createTrueReason("Statement is not proven. Expected red color.");
-				}	
-			}	
-		} else if (id.equals(ID_PRE_TEXT)) {
-			Condition domainObject = (Condition) context.getDomainObject();
-			String[] fragments = domainObject.eResource().getURI().trimFileExtension().toString().split("/");
-			String methodName = fragments[fragments.length-1];
-			String cbcmodelPath = getDiagram().eResource().getURI().trimSegments(1).appendSegment(methodName +".cbcmodel").toPlatformString(true);
-			Resource cbcmodelResource = rs.getResource(URI.createPlatformResourceURI(cbcmodelPath, true), true);
-			
-			for (EObject obj : cbcmodelResource.getContents()) {
-				if (obj instanceof CbCFormula) {
-					CbCFormula formula = (CbCFormula) obj;
-					if (!formula.getStatement().getPreCondition().getName().equals(domainObject.getName())) {
-						return Reason.createTrueReason("Precondition differs to cbcmodel of method.");
-					}
-				}
-			}
-		} else if (id.equals(ID_POST_TEXT)) {
-			Condition domainObject = (Condition) context.getDomainObject();
-			String[] fragments = domainObject.eResource().getURI().trimFileExtension().toString().split("/");
-			String methodName = fragments[fragments.length-1];
-			String cbcmodelPath = getDiagram().eResource().getURI().trimSegments(1).appendSegment(methodName +".cbcmodel").toPlatformString(true);
-			Resource cbcmodelResource = rs.getResource(URI.createPlatformResourceURI(cbcmodelPath, true), true);
-			
-			for (EObject obj : cbcmodelResource.getContents()) {
-				if (obj instanceof CbCFormula) {
-					CbCFormula formula = (CbCFormula) obj;
-					if (!formula.getStatement().getPostCondition().getName().equals(domainObject.getName())) {
-						return Reason.createTrueReason("Postcondition differs to cbcmodel of method.");
-					}
-				}
-			}
-		} else if (id.equals(ID_SIG_TEXT)) {
-			MultiText sigText = (MultiText) context.getGraphicsAlgorithm();
-			Method domainObject = (Method) context.getDomainObject();
-			if (!sigText.getValue().equals(domainObject.getSignature())) {
-				return Reason.createTrueReason("Signature is not up to date.");
-			}
-<<<<<<< HEAD
-=======
-		} else if (id.equals(ID_MOD_TEXT)) {
-			MultiText modText = (MultiText) context.getGraphicsAlgorithm();
-			Method domainObject = (Method) context.getDomainObject();
-			if (!modText.getValue().equals(getModifiablesString(domainObject.getParentClass(), domainObject.getCbcStartTriple().getStatement().getPostCondition()))) {
-				return Reason.createTrueReason("Modifiables are not up to date.");
-			}
->>>>>>> master
-		}
-		return Reason.createFalseReason();
-	}
-
-	public boolean canUpdate(IdUpdateContext context) {
-		Object bo = getBusinessObjectForPictogramElement(context.getPictogramElement());
-		return (bo instanceof Method);
-	}
-
-	@Override
-	protected boolean update(IdUpdateContext context, String id) {
-		if (id.equals(ID_MAIN_RECTANGLE)) {
-			RoundedRectangle rectangle = (RoundedRectangle) context.getGraphicsAlgorithm();
-			Method domainObject = (Method) context.getDomainObject();
-			String classPath = FileUtil.getProjectLocation(getDiagram().eResource().getURI()) +"/"+ domainObject.getCbcStartTriple().getClassName() + "\\";
-			File cbcmodelFile = new File(classPath + domainObject.getCbcStartTriple().getMethodName() + ".diagram");
-			if (cbcmodelFile.exists()) {
-				URI cbcmodelURI = URI.createFileURI(classPath + domainObject.getName() + ".cbcmodel");
-				CbCFormula read = CbcClassUtil.readFormula(cbcmodelURI);
-				if (read != null) {
-					domainObject.getCbcStartTriple().setProven(read.isProven());
-				}
-			}
-			if (domainObject.getCbcStartTriple().isProven()) {
-				rectangle.setForeground(manageColor(IColorConstant.DARK_GREEN));
-			} else {
-				rectangle.setForeground(manageColor(IColorConstant.RED));
-			}
-			return true;
-		} else if (context.getGraphicsAlgorithm() instanceof MultiText && context.getDomainObject() instanceof Method
-				&& id.equals(ID_SIG_TEXT)) {
-			MultiText nameText = (MultiText) context.getGraphicsAlgorithm();
-			Method domainObject = (Method) context.getDomainObject();
-			if (!nameText.getValue().equals(domainObject.getSignature())) {
-				nameText.setValue(domainObject.getSignature());
-				DirectEditingContext dec = new DirectEditingContext(context.getPictogramElement(), context.getGraphicsAlgorithm());
-				setValue(domainObject.getSignature(), dec);
-			}
-			return true;
-		} else if (id.equals(ID_PRE_TEXT) && context.getDomainObject() instanceof Condition) {
-			Condition domainObject = (Condition) context.getDomainObject();
-			String[] fragments = domainObject.eResource().getURI().trimFileExtension().toString().split("/");
-			String methodName = fragments[fragments.length-1];
-			String cbcmodelPath = getDiagram().eResource().getURI().trimSegments(1).appendSegment(methodName +".cbcmodel").toPlatformString(true);
-			Resource cbcmodelResource = rs.getResource(URI.createPlatformResourceURI(cbcmodelPath, true), true);
-			
-			for (EObject obj : cbcmodelResource.getContents()) {
-				if (obj instanceof CbCFormula) {
-					CbCFormula formula = (CbCFormula) obj;
-					domainObject.setName(formula.getStatement().getPreCondition().getName());
-					return true;
-				}
-			}
-		} else if (id.equals(ID_POST_TEXT) && context.getDomainObject() instanceof Condition) {
-			Condition domainObject = (Condition) context.getDomainObject();
-			String[] fragments = domainObject.eResource().getURI().trimFileExtension().toString().split("/");
-			String methodName = fragments[fragments.length-1];
-			String cbcmodelPath = getDiagram().eResource().getURI().trimSegments(1).appendSegment(methodName +".cbcmodel").toPlatformString(true);
-			Resource cbcmodelResource = rs.getResource(URI.createPlatformResourceURI(cbcmodelPath, true), true);
-			
-			for (EObject obj : cbcmodelResource.getContents()) {
-				if (obj instanceof CbCFormula) {
-					CbCFormula formula = (CbCFormula) obj;
-					domainObject.setName(formula.getStatement().getPostCondition().getName());
-					return true;
-				}
-			}
-<<<<<<< HEAD
-		} else if (id.equals(ID_IMAGE_PROVEN)) {
-			Method domainObject = (Method) context.getDomainObject();
-			Image image = (Image) context.getGraphicsAlgorithm();
-			String path = FileUtil.getProjectLocation(getDiagram().eResource().getURI())+ "/features/" + domainObject.getParentClass().getFeature() + "/" + domainObject.getCbcStartTriple().getClassName() + "/" + domainObject.getName() + ".cbcmodel";
-			File cbcmodelFile = new File(path);
-			if (cbcmodelFile.exists()) {
-				URI cbcmodelURI = URI.createFileURI(path);
-				CbCFormula read = CbcClassUtil.readFormula(cbcmodelURI);
-				if (read != null) {
-					domainObject.getCbcStartTriple().setProven(read.isProven());
-					if (read.isProven()) {
-						image.setId(CbCClassImageProvider.IMG_PROVEN);
-					} else {
-						image.setId(CbCClassImageProvider.IMG_UNPROVEN);
-					}
-				}				
-			}
-=======
-		} else if (id.equals(ID_MOD_TEXT) && context.getGraphicsAlgorithm() instanceof MultiText && context.getDomainObject() instanceof Method) {
-			MultiText modText = (MultiText) context.getGraphicsAlgorithm();
-			Method domainObject = (Method) context.getDomainObject();
-			if (!modText.getValue().equals(getModifiablesString(domainObject.getParentClass(), domainObject.getCbcStartTriple().getStatement().getPostCondition()))) {
-				modText.setValue(getModifiablesString(domainObject.getParentClass(), domainObject.getCbcStartTriple().getStatement().getPostCondition()));
-			}
-			return true;
->>>>>>> master
-		}
-		return false;
-	}
-
-	@Override
-	public void setValue(String value, IDirectEditingContext context) {
-		Method method = (Method) getBusinessObjectForPictogramElement(context.getPictogramElement());
-<<<<<<< HEAD
-		String oldName = method.getName();
-		String oldSignature = method.getSignature();
-		int oldParamSize = method.getParameters().size();
-		method.setSignature(value.trim());
-		if (!oldName.equals(method.getName())) {
-			method.setSignature(oldSignature);
-			JOptionPane.showMessageDialog(null, "Can not change name of method in the this state of CorC.");
-			return;
-		}
-		
-		if (method.getParameters().size() != oldParamSize) {
-			URI urii = getDiagram().eResource().getURI();
-			ClassUtil.refreshProject(FileUtil.getProjectLocation(urii));
-=======
-		GraphicsAlgorithm ga = context.getGraphicsAlgorithm();
-		if (ga instanceof RoundedRectangle) {
-			String oldName = method.getName();
-			String oldSignature = method.getSignature();
-			int oldParamSize = method.getParameters().size();
-			method.setSignature(value.trim());
-			if (!oldName.equals(method.getName())) {
-				method.setSignature(oldSignature);
-				JOptionPane.showMessageDialog(null, "Can not change name of method in the this state of CorC.");
-				return;
-			}
-		
-			if (method.getParameters().size() != oldParamSize) {
-				URI urii = getDiagram().eResource().getURI();
-				ClassUtil.refreshProject(FileUtil.getProjectLocation(urii));
-			}
-		} else if (ga instanceof MultiText) {
-			String[] split = value.trim().split(",");
-			method.getCbcStartTriple().getStatement().getPostCondition().getModifiables().clear();
-			for (String s : split) {
-				if (!s.equals("")) method.getCbcStartTriple().getStatement().getPostCondition().getModifiables().add(s.trim());
-			}
-			try {
-				method.getCbcStartTriple().getStatement().getPostCondition().eResource().save(Collections.EMPTY_MAP);
-				method.getCbcStartTriple().getStatement().getPostCondition().eResource().setTrackingModification(true);
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-			UpdateConditionsOfChildren.updateConditionsofChildren(method.getCbcStartTriple().getStatement().getPostCondition());	
->>>>>>> master
-		}
-		updatePictogramElement(((Shape) context.getPictogramElement()));		
-	}
-
-	@Override
-	public String getInitialValue(IDirectEditingContext context) {
-		Method method = (Method) getBusinessObjectForPictogramElement(context.getPictogramElement());
-<<<<<<< HEAD
-		return method.getSignature();
-=======
-		GraphicsAlgorithm ga = context.getGraphicsAlgorithm();
-		if (ga instanceof RoundedRectangle) {
-			return method.getSignature();
-		} else {
-			return getModifiablesString(method.getParentClass(), method.getCbcStartTriple().getStatement().getPostCondition());
-		}
->>>>>>> master
-	}
-	
-	@Override
-	public void delete(IDeleteContext context) {
-		rs.getResources();
-		Shape shape = (Shape) context.getPictogramElement();
-		ContainerShape container = shape.getContainer();	
-		Method method = (Method) getBusinessObjectForPictogramElement(context.getPictogramElement());
-		String toDelete = method.getParentClass().getName() + "/" + method.getName() + ".cbcmodel";
-		ModelClass mc = method.getParentClass();
-		mc.getMethods().remove(method);
-		super.delete(context);
-		layoutPictogramElement(container);
-		for (Resource resource : rs.getResources()) {
-			if (resource.getURI().toString().endsWith(toDelete)) {
-				rs.getResources().remove(resource);
-				break;
-			}
-		}
-	}
-<<<<<<< HEAD
-=======
-	
-	private String getModifiablesString(ModelClass parent, Condition condition) {
-		String modString = "";
-		if (condition.getModifiables() != null && condition.getModifiables().size() > 0) {
-			for (String mod : condition.getModifiables()) {
-				for (Field f : parent.getFields()) {
-					if (f.getName() != null) {
-						String fieldName = f.getName().replace("[", "").replace("]", "").trim();
-						if (mod.replace("this.","").startsWith(fieldName)) {
-							if (modString.length() != 0) {
-								modString = modString + ", " + mod.replace("this.","");
-							} else {
-								modString = mod.replace("this.","");
-							}
-							break;
-						}
-					}
-				}
-			}
-		}
-		return modString;
-	}
->>>>>>> master
-}
\ No newline at end of file
diff --git a/de.tu-bs.cs.isf.cbcclass.tool/src/de/tu_bs/cs/isf/cbcclass/tool/patterns/ModelClassPattern.java.orig b/de.tu-bs.cs.isf.cbcclass.tool/src/de/tu_bs/cs/isf/cbcclass/tool/patterns/ModelClassPattern.java.orig
deleted file mode 100644
index 06d484e50..000000000
--- a/de.tu-bs.cs.isf.cbcclass.tool/src/de/tu_bs/cs/isf/cbcclass/tool/patterns/ModelClassPattern.java.orig
+++ /dev/null
@@ -1,671 +0,0 @@
-package de.tu_bs.cs.isf.cbcclass.tool.patterns;
-
-import java.awt.Frame;
-import java.io.IOException;
-import java.util.ArrayList;
-<<<<<<< HEAD
-
-=======
->>>>>>> master
-import java.util.List;
-
-import javax.swing.JFrame;
-import javax.swing.JOptionPane;
-
-import org.eclipse.core.resources.IProject;
-<<<<<<< HEAD
-=======
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
->>>>>>> master
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.graphiti.features.IReason;
-import org.eclipse.graphiti.features.context.IAddContext;
-import org.eclipse.graphiti.features.context.ICreateContext;
-import org.eclipse.graphiti.features.context.IDirectEditingContext;
-import org.eclipse.graphiti.features.impl.Reason;
-import org.eclipse.graphiti.mm.algorithms.GraphicsAlgorithm;
-import org.eclipse.graphiti.mm.algorithms.Image;
-import org.eclipse.graphiti.mm.algorithms.MultiText;
-import org.eclipse.graphiti.mm.algorithms.Polyline;
-import org.eclipse.graphiti.mm.algorithms.RoundedRectangle;
-import org.eclipse.graphiti.mm.algorithms.Text;
-import org.eclipse.graphiti.mm.algorithms.impl.TextImpl;
-import org.eclipse.graphiti.mm.algorithms.styles.Font;
-import org.eclipse.graphiti.mm.algorithms.styles.Orientation;
-import org.eclipse.graphiti.mm.algorithms.styles.Point;
-import org.eclipse.graphiti.mm.pictograms.ContainerShape;
-import org.eclipse.graphiti.mm.pictograms.Diagram;
-import org.eclipse.graphiti.mm.pictograms.PictogramElement;
-import org.eclipse.graphiti.mm.pictograms.Shape;
-import org.eclipse.graphiti.pattern.IPattern;
-import org.eclipse.graphiti.pattern.id.IdLayoutContext;
-import org.eclipse.graphiti.pattern.id.IdPattern;
-import org.eclipse.graphiti.pattern.id.IdUpdateContext;
-import org.eclipse.graphiti.services.Graphiti;
-import org.eclipse.graphiti.services.IGaService;
-import org.eclipse.graphiti.services.IPeCreateService;
-import org.eclipse.graphiti.util.IColorConstant;
-import org.eclipse.graphiti.util.PredefinedColoredAreas;
-
-<<<<<<< HEAD
-import de.tu_bs.cs.isf.cbc.cbcclass.model.cbcclass.CbcclassFactory;
-import de.tu_bs.cs.isf.cbc.cbcclass.model.cbcclass.Field;
-import de.tu_bs.cs.isf.cbc.cbcclass.model.cbcclass.ModelClass;
-import de.tu_bs.cs.isf.cbc.cbcmodel.Condition;
-import de.tu_bs.cs.isf.cbc.util.FileUtil;
-import de.tu_bs.cs.isf.cbcclass.tool.diagram.CbCClassImageProvider;
-import helper.ClassUtil;
-import model.CbcClassUtil;
-=======
-import de.tu_bs.cs.isf.cbc.cbcclass.CbcclassFactory;
-import de.tu_bs.cs.isf.cbc.cbcclass.Field;
-import de.tu_bs.cs.isf.cbc.cbcclass.ModelClass;
-import de.tu_bs.cs.isf.cbc.cbcmodel.Condition;
-import de.tu_bs.cs.isf.cbc.tool.diagram.CbCImageProvider;
-import de.tu_bs.cs.isf.cbc.util.FileUtil;
-import de.tu_bs.cs.isf.cbc.util.ClassUtil;
-import de.tu_bs.cs.isf.cbcclass.tool.helper.CbcClassUtil;
->>>>>>> master
-
-public class ModelClassPattern extends IdPattern implements IPattern {
-
-	@Override
-	public String getCreateName() {
-		return "Model Class";
-	}
-
-	@Override
-	public String getCreateDescription() {
-		return "Create a Model Class";
-	}
-	
-<<<<<<< HEAD
-=======
-	
->>>>>>> master
-	private static final String ID_NAME_TEXT = "nameText";
-	private static final String ID_CLASS_FIELDS_TEXT = "fieldsNameText";
-	private static final String ID_CLASS_INVARIANTS_TEXT = "classInvariantsText";
-	
-	private static final String ID_MAIN_RECTANGLE = "mainRectangle";
-	private static final String ID_IMAGE_PROVEN = "imageproven";
-	// Header:
-	private static final String ID_CLASS_INVARIANTS_HEADER = "ivHeader";
-	private static final String ID_CLASS_FIELDS_HEADER = "fHeader";
-	// lines:
-	private static final String ID_HOR1_LINE = "hor1Line";
-	private static final String ID_HOR2_LINE = "hor2Line";
-	private static final String ID_HOR3_LINE = "hor3Line";
-	private static final String ID_HOR4_LINE = "hor4Line";	
-	
-	private int width;
-	private int height;	
-<<<<<<< HEAD
-=======
-	private int numShapesOfEmptyClass;
->>>>>>> master
-	
-	public static ModelClass instance;	
-	private IProject project;
-	
-	public ModelClassPattern() {
-		super();
-<<<<<<< HEAD
-=======
-		this.numShapesOfEmptyClass = 8;
->>>>>>> master
-	}
-	
-	@Override
-	public int getEditingType() {
-		return TYPE_TEXT;
-	}
-	
-	@Override
-	public boolean isMainBusinessObjectApplicable(Object mainBusinessObject) {
-		return mainBusinessObject instanceof ModelClass;
-	}
-	
-	public boolean canCreate(ICreateContext context) {
-		ModelClass modelClass = null;
-		for (Shape shape : getDiagram().getChildren()) {
-			Object obj = getBusinessObjectForPictogramElement(shape);
-			if (obj instanceof ModelClass) {
-				modelClass = (ModelClass) obj;
-			}
-		}
-	
-		if (modelClass != null) return false;
-		return context.getTargetContainer() instanceof Diagram;
-	} 
-	
-	public Object[] create (ICreateContext context) {
-		Frame jf=new JFrame();
-		jf.setAlwaysOnTop(true);
-		
-		ModelClass modelClass = CbcclassFactory.eINSTANCE.createModelClass();
-		modelClass.setName(getDiagram().getName());
-		
-		String inheritance = "";
-		String path = FileUtil.getProjectLocation(getDiagram().eResource().getURI());
-		Resource inheritanceResource = null;
-		while (inheritance.equals("")) {
-			inheritance = (String) JOptionPane.showInputDialog(null, "Should this class inherit? Type a class name or press cancel.");
-			if (inheritance != null) inheritanceResource = ClassUtil.getClassModelResource(path, inheritance.trim());
-			if (inheritanceResource == null && inheritance != null && !inheritance.equals(modelClass.getName())) {
-				inheritance = "";
-			} else if (inheritance == null) {
-				inheritance = "none";
-			}
-		}
-		
-		if (!inheritance.equals("none")) {
-			modelClass.setInheritsFrom((ModelClass) inheritanceResource.getContents().get(0));
-		}
-		
-		URI uri = getDiagram().eResource().getURI();
-		project = FileUtil.getProjectFromFileInProject(uri);
-		try {
-			if(project.getNature("de.ovgu.featureide.core.featureProjectNature") != null) {
-				String[] segments = uri.segments();
-				modelClass.setFeature(segments[segments.length-3]);
-			}
-		} catch (CoreException e) {
-			e.printStackTrace();
-		}
-
-		try {
-			CbcClassUtil.saveModelClass(modelClass, getDiagram());
-		} catch (CoreException | IOException e) {
-			e.printStackTrace();
-		}		
-		
-		addGraphicalRepresentation(context, modelClass);
-		return new Object[] { modelClass };
-	}
-	
-	public boolean canAdd(IAddContext context) {
-		return super.canAdd(context) && context.getTargetContainer() instanceof Diagram;
-	}
-	
-	@Override
-	public boolean canDirectEdit(IDirectEditingContext context) {
-		Object domainObject = getBusinessObjectForPictogramElement(context.getPictogramElement());
-		GraphicsAlgorithm ga = context.getGraphicsAlgorithm();
-		if ((domainObject instanceof ModelClass) && ga instanceof RoundedRectangle) {
-			return true;
-		}
-		return false;
-	}
-	
-	@Override
-	protected PictogramElement doAdd(IAddContext context) {
-		manageColor(IColorConstant.DARK_GREEN);
-		Diagram targetDiagram = (Diagram) context.getTargetContainer();
-		ModelClass addedModelClass = (ModelClass) context.getNewObject();
-		
-		IPeCreateService peCreateService = Graphiti.getPeCreateService();
-		IGaService gaService = Graphiti.getGaService();
-
-		width = context.getWidth() <= 0 ? 350 : context.getWidth();
-		height = context.getHeight() <= 0 ? 250 : context.getHeight();
-
-		Font headerFont = gaService.manageFont(getDiagram(), "Arial", 9, false, true);
-		
-		// Main contents area
-		ContainerShape outerContainerShape = peCreateService.createContainerShape(targetDiagram, true);
-		RoundedRectangle mainRectangle = gaService.createRoundedRectangle(outerContainerShape, 20, 20);
-		mainRectangle.setFilled(true);
-		gaService.setRenderingStyle(mainRectangle, PredefinedColoredAreas.getBlueWhiteAdaptions());
-		setId(mainRectangle, ID_MAIN_RECTANGLE);
-		gaService.setLocationAndSize(mainRectangle, context.getX(), context.getY(), width, height);
-
-		// create link and wire it
-		link(outerContainerShape, addedModelClass);	
-		
-		// ModelClass
-		Shape proveShape = peCreateService.createShape(outerContainerShape, false);
-<<<<<<< HEAD
-		Image image = gaService.createImage(proveShape, CbCClassImageProvider.IMG_UNPROVEN);
-=======
-		Image image = gaService.createImage(proveShape, CbCImageProvider.IMG_UNPROVEN);
->>>>>>> master
-		setId(image, ID_IMAGE_PROVEN);
-		
-		Shape textShapeName = peCreateService.createShape(outerContainerShape, false);
-		MultiText nameText = gaService.createMultiText(textShapeName, addedModelClass.getName());
-		setId(nameText, ID_NAME_TEXT);
-		nameText.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		nameText.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		nameText.setFont(headerFont);
-		
-		// Invariants
-		Shape hor1LineShape = peCreateService.createShape(outerContainerShape, false);
-		Polyline hor1Polyline = gaService.createPolyline(hor1LineShape);
-		setId(hor1Polyline, ID_HOR1_LINE);
-		
-		Shape invariantsHeaderShape = peCreateService.createShape(outerContainerShape, false);
-		Text invariantsHeader = gaService.createText(invariantsHeaderShape, "invariants");
-		setId(invariantsHeader, ID_CLASS_INVARIANTS_HEADER);
-		invariantsHeader.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		invariantsHeader.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		invariantsHeader.setFont(headerFont);
-		
-		Shape hor2LineShape = peCreateService.createShape(outerContainerShape, false);
-		Polyline hor2Polyline = gaService.createPolyline(hor2LineShape);
-		setId(hor2Polyline, ID_HOR2_LINE);
-		
-		// Fields
-		Shape hor3LineShape = peCreateService.createShape(outerContainerShape, false);
-		Polyline hor3Polyline = gaService.createPolyline(hor3LineShape);
-		setId(hor3Polyline, ID_HOR3_LINE);
-		
-		Shape fieldsHeaderShape = peCreateService.createShape(outerContainerShape, false);
-		Text fieldsHeader = gaService.createText(fieldsHeaderShape, "fields");
-		setId(fieldsHeader, ID_CLASS_FIELDS_HEADER);
-		fieldsHeader.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-		fieldsHeader.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-		fieldsHeader.setFont(headerFont);
-		
-		Shape hor4LineShape = peCreateService.createShape(outerContainerShape, false);
-		Polyline hor4Polyline = gaService.createPolyline(hor4LineShape);
-		setId(hor4Polyline, ID_HOR4_LINE);
-		
-		peCreateService.createChopboxAnchor(outerContainerShape);
-		peCreateService.createChopboxAnchor(textShapeName);
-		
-		link(outerContainerShape, addedModelClass);
-		link(textShapeName, addedModelClass);
-<<<<<<< HEAD
-		link(proveShape, addedModelClass);
-=======
->>>>>>> master
-		
-		return outerContainerShape;	
-	}
-
-	@Override
-	protected boolean layout(IdLayoutContext context, String id) {
-		boolean changesDone = false;
-		GraphicsAlgorithm mainRectangle = context.getRootPictogramElement().getGraphicsAlgorithm();
-		GraphicsAlgorithm ga = context.getGraphicsAlgorithm();
-		width = mainRectangle.getWidth();
-		height = mainRectangle.getHeight();
-
-		int xMiddle = width / 3;
-		int heightName = 30; // height of name of modelclass
-		int heightHeader = 20; // height of the headers of fields, invariants
-		int positionHeader = 40; // position where the Header is
-		int sizeText = 30;
-		int positionText = positionHeader + heightHeader; // position from the blocks (pre, statement, post)
-		
-		ModelClass modelClass = (ModelClass) getBusinessObjectForPictogramElement(context.getRootPictogramElement());
-		int sizeInvariants = modelClass.getClassInvariants().size();
-		int sizeFields = modelClass.getFields().size();
-
-		if (modelClass.getInheritsFrom() != null) {
-			sizeInvariants += modelClass.getInheritsFrom().getClassInvariants().size();
-			sizeFields += modelClass.getInheritsFrom().getFields().size();
-		}
-		
-		sizeText = 30;
-		
-		// resize modelclass
-		int totalSize = sizeInvariants + sizeFields;
-		mainRectangle.setHeight((totalSize * sizeText + 1) + 170);		
-
-		int beginYFieldHeader = positionText + (sizeText * sizeInvariants) + 40;
-		
-		if (id.equals(ID_NAME_TEXT)) {
-			Graphiti.getGaService().setLocationAndSize(ga, 0, 5, mainRectangle.getWidth(), heightName);
-			changesDone = true;
-		} else if (id.equals(ID_CLASS_INVARIANTS_TEXT)) {
-			Graphiti.getGaService().setLocationAndSize(ga, 0, positionText + sizeText * getIndex(ga), mainRectangle.getWidth(), sizeText);
-			changesDone = true;
-		} else if (id.equals(ID_CLASS_FIELDS_TEXT)) {
-			Graphiti.getGaService().setLocationAndSize(ga, 0, beginYFieldHeader + sizeText * (sizeInvariants == 0 ? getIndex(ga) + 1 : getIndex(ga) - sizeInvariants + 1) - 7, mainRectangle.getWidth(), sizeText);
-			changesDone = true;
-		} else if (id.equals(ID_IMAGE_PROVEN)) {
-			Graphiti.getGaService().setLocationAndSize(ga, mainRectangle.getWidth() - 20, 10, 10, 10);
-			changesDone = true;
-		} else if (id.equals(ID_CLASS_INVARIANTS_HEADER)) {
-			Graphiti.getGaService().setLocationAndSize(ga, xMiddle, positionHeader, xMiddle, heightHeader);
-			changesDone = true;
-		} else if (id.equals(ID_CLASS_FIELDS_HEADER)) {
-			Graphiti.getGaService().setLocationAndSize(ga, xMiddle, beginYFieldHeader, xMiddle, heightHeader);
-			changesDone = true;
-		} else if (id.equals(ID_HOR1_LINE)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService()
-					.createPointList(new int[] { 0, positionHeader, mainRectangle.getWidth(), positionHeader });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		} else if (id.equals(ID_HOR2_LINE)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService().createPointList(new int[] { 0, positionHeader + heightHeader,
-					mainRectangle.getWidth(), positionHeader + heightHeader });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		} else if (id.equals(ID_HOR3_LINE)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService().createPointList(new int[] { 0, beginYFieldHeader,
-					mainRectangle.getWidth(), beginYFieldHeader });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		} else if (id.equals(ID_HOR4_LINE)) {
-			Polyline polyline = (Polyline) ga;
-			polyline.getPoints().clear();
-			List<Point> pointList = Graphiti.getGaService().createPointList(new int[] { 0, beginYFieldHeader + 20,
-					mainRectangle.getWidth(), beginYFieldHeader + 20 });
-			polyline.getPoints().addAll(pointList);
-			changesDone = true;
-		} 
-		return changesDone;
-	}
-
-	@Override
-	protected IReason updateNeeded(IdUpdateContext context, String id) {		
-		if (id.equals(ID_MAIN_RECTANGLE)) {
-			ContainerShape containerShape = (ContainerShape) context.getPictogramElement();
-			ModelClass mc = (ModelClass) context.getDomainObject();
-			List<Condition> invs = mc.getClassInvariants();
-			List<Field> fields = mc.getFields();
-			List<Condition> inheritedInvs = new ArrayList<Condition>();
-			List<Field> inheritedFields = new ArrayList<Field>();
-			if (mc.getInheritsFrom() != null) {
-<<<<<<< HEAD
-				inheritedInvs = mc.getInheritsFrom().getClassInvariants();
-				inheritedFields = mc.getInheritsFrom().getFields();
-			}
-			
-			int size = invs.size() + fields.size() + inheritedInvs.size() + inheritedFields.size();
-			if (containerShape.getChildren().size() - 8 != size) {
-				return Reason.createTrueReason("Number of Elements differ. Expected: " + size + " Actual: " + (containerShape.getChildren().size() - 8));
-=======
-				var inheritee = (ModelClass)ClassUtil.getClassModelResource(FileUtil.getProjectLocation(mc.getInheritsFrom().eResource().getURI()), mc.getInheritsFrom().getName()).getContents().get(0);
-				//mc.setInheritsFrom(mc);
-				inheritedInvs = inheritee.getClassInvariants();
-				inheritedFields = inheritee.getFields();
-			}
-			int size = invs.size() + fields.size() + inheritedInvs.size() + inheritedFields.size();
-			if (containerShape.getChildren().size() - numShapesOfEmptyClass != size) { 
-				int actual = (containerShape.getChildren().size() - numShapesOfEmptyClass);
-				return Reason.createTrueReason("Number of Elements differ. Expected: " + size + " Actual: " + actual);
->>>>>>> master
-			}
-			
-			List<Integer> found = new ArrayList<Integer>();
-			EList<Shape> shapes = containerShape.getChildren();
-<<<<<<< HEAD
-			for (int i = 8; i < shapes.size(); i++) {
-=======
-			for (int i = numShapesOfEmptyClass; i < shapes.size(); i++) {
->>>>>>> master
-				Shape shape = shapes.get(i);
-				EList<EObject> objects = shape.eContents();
-				for (int j = 0; j < objects.size(); j++) {
-					EObject obj = objects.get(j);
-					if (obj instanceof Text) {
-						int index = i - 8;
-						// check own fields
-						for (int k = 0; k < fields.size(); k++) {
-							Field f = fields.get(k);
-							if (f.getDisplayedName().equalsIgnoreCase(((Text) obj).getValue()) && !found.contains(index)) {
-								found.add(index);
-								break;
-							}
-						} 
-						// check inherited fields
-						for (int k = 0; k < inheritedFields.size(); k++) {
-							Field f = inheritedFields.get(k);
-							if (f.getDisplayedName().equalsIgnoreCase(((Text) obj).getValue().replace(" inherited", "")) && !found.contains(index)) {
-								found.add(index);
-								break;
-							}
-						}
-						// check own invariants
-						for (int k = 0; k < invs.size(); k++) {
-							Condition c = invs.get(k);
-							if (("{" + c.getName() + "}").equalsIgnoreCase(((Text) obj).getValue()) && !found.contains(index)) {
-								found.add(index);
-								break;
-							}
-						}
-						// check inherited invariants
-						for (int k = 0; k < inheritedInvs.size(); k++) {
-							Condition c = inheritedInvs.get(k);
-							if (("{" + c.getName() + "}").equalsIgnoreCase(((Text) obj).getValue().replace(" inherited", "")) && !found.contains(index)) {
-								found.add(index);
-								break;
-							}
-						}
-						break;
-					}
-				}
-			}
-			if (found.size() != size) {
-				return Reason.createTrueReason("ModelClass differs.");
-			}	
-		}
-
-		return Reason.createFalseReason();	
-
-	}
-
-	@Override
-	protected boolean update(IdUpdateContext context, String id) {
-		if (id.equals(ID_NAME_TEXT)) {
-			MultiText nameText = (MultiText) context.getGraphicsAlgorithm();
-			ModelClass domainObject = (ModelClass) context.getDomainObject();
-			if (domainObject.getInheritsFrom() != null) {
-				nameText.setValue(domainObject.getName() + " extends " + domainObject.getInheritsFrom().getName());
-			} else {
-				nameText.setValue(domainObject.getName());
-			}
-			return true;
-		} else if (id.equals(ID_MAIN_RECTANGLE)) {
-			ModelClass modelClass = (ModelClass) context.getDomainObject();
-
-			for (int i = 0; i < modelClass.getFields().size();) {
-				if (modelClass.getFields().get(i).getType() == null) {
-					modelClass.getFields().remove(i);
-				} else i++;
-			}
-			
-			
-			List<Condition> inheritedInvs = new ArrayList<Condition>();
-			List<Field> inheritedFields = new ArrayList<Field>();
-			if (modelClass.getInheritsFrom() != null) {
-<<<<<<< HEAD
-				inheritedInvs = modelClass.getInheritsFrom().getClassInvariants();
-				inheritedFields = modelClass.getInheritsFrom().getFields();
-			}
-
-			List<Integer> checkedShapes = new ArrayList<>();
-			checkedShapes.add(0); //prove shape
-=======
-				var inheritee = (ModelClass)ClassUtil.getClassModelResource(FileUtil.getProjectLocation(modelClass.getInheritsFrom().eResource().getURI()), modelClass.getInheritsFrom().getName()).getContents().get(0);
-				for (int i = 0; i < inheritee.getFields().size(); i++) {
-					if (inheritee.getFields().get(i).getName() == null) {
-						inheritee.getFields().remove(i);
-						i--;
-					}
-				}
-				inheritedInvs = inheritee.getClassInvariants();
-				inheritedFields = inheritee.getFields();
-			}
-
-			List<Integer> checkedShapes = new ArrayList<>();
-			checkedShapes.add(0); //prove shape 
->>>>>>> master
-			checkedShapes.add(1); //modelclass name
-			checkedShapes.add(2); //line above inv
-			checkedShapes.add(3); //inv name
-			checkedShapes.add(4); //line below inv	
-			checkedShapes.add(5); //line above fields
-			checkedShapes.add(6); //fields name
-			checkedShapes.add(7); //line below fields
-			List<Condition> invs = modelClass.getClassInvariants();
-			List<Field> fields = modelClass.getFields();			
-			
-			// invariants
-			for (int i = 0; i < invs.size() + inheritedInvs.size(); i++) {
-				Condition inv = i < inheritedInvs.size() ? inheritedInvs.get(i) : invs.get(i - inheritedInvs.size());
-				EList<Shape> shapes = ((ContainerShape) context.getPictogramElement()).getChildren();
-				boolean check = false;
-<<<<<<< HEAD
-				for (int j = 8; j < shapes.size(); j++) {
-=======
-				for (int j = numShapesOfEmptyClass; j < shapes.size(); j++) {
->>>>>>> master
-					Shape shape = shapes.get(j);
-					if (shape.getGraphicsAlgorithm() instanceof TextImpl) {
-						Text text = (Text) shape.getGraphicsAlgorithm();
-						if (inv.getName().equals(text.getValue().replace(" inherited", "").replace("{", "").replace("}", ""))) {
-							check = true;
-							checkedShapes.add(j);
-							break;
-						}
-					} else {
-						if (!checkedShapes.contains(j)) checkedShapes.add(j);
-					}
-				}
-				if (!check) {
-					int newIndex = 0;
-					ContainerShape container = (ContainerShape) context.getPictogramElement();
-					for (Shape childShape : container.getChildren()) {
-						if (getIndex(childShape.getGraphicsAlgorithm()) >= newIndex) {
-							setIndex(childShape.getGraphicsAlgorithm(), getIndex(childShape.getGraphicsAlgorithm()) + 1);
-						}
-					}
-
-					Shape shapeText = Graphiti.getPeCreateService().createShape((ContainerShape) context.getPictogramElement(), true);
-					Text variableNameText = Graphiti.getGaService().createText(shapeText, "{" + inv.getName() + "}");
-					if (!((ModelClass) inv.eContainer()).getName().equals(modelClass.getName())) {
-						variableNameText.setValue(variableNameText.getValue() + " inherited");
-					}
-					setId(variableNameText, ID_CLASS_INVARIANTS_TEXT);
-					setIndex(variableNameText, newIndex);
-					variableNameText.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-					variableNameText.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-					link(shapeText, inv);
-
-					checkedShapes.add(shapes.size() - 1);
-				}
-			}
-
-			// fields
-			for (int i = 0; i < fields.size() + inheritedFields.size(); i++) {
-				Field field = i < inheritedFields.size() ? inheritedFields.get(i) : fields.get(i - inheritedFields.size());
-				EList<Shape> shapes = ((ContainerShape) context.getPictogramElement()).getChildren();
-				boolean check = false;
-<<<<<<< HEAD
-				for (int j = 8; j < shapes.size(); j++) {
-=======
-				for (int j = numShapesOfEmptyClass; j < shapes.size(); j++) { 
->>>>>>> master
-					Shape shape = shapes.get(j);
-					if (shape.getGraphicsAlgorithm() instanceof TextImpl) {
-						Text text = (Text) shape.getGraphicsAlgorithm();
-						if (field.getDisplayedName().equals(text.getValue().replace(" inherited", ""))) {
-							check = true;
-							checkedShapes.add(j);
-							break;
-						}
-					} else {
-						if (!checkedShapes.contains(j)) checkedShapes.add(j);
-					}
-				}
-				if (!check) {
-					int newIndex = invs.size() + inheritedInvs.size() + i;
-					ContainerShape container = (ContainerShape) context.getPictogramElement();
-					for (Shape childShape : container.getChildren()) {
-						if (getIndex(childShape.getGraphicsAlgorithm()) >= newIndex) {
-							setIndex(childShape.getGraphicsAlgorithm(), getIndex(childShape.getGraphicsAlgorithm()) + 1);
-						}
-					}
-
-					Shape shapeText = Graphiti.getPeCreateService().createShape((ContainerShape) context.getPictogramElement(), true);
-					Text variableNameText = Graphiti.getGaService().createText(shapeText, field.getDisplayedName());
-					if (!((ModelClass) field.eContainer()).getName().equals(modelClass.getName())) {
-						variableNameText.setValue(variableNameText.getValue() + " inherited");
-					}
-					setId(variableNameText, ID_CLASS_FIELDS_TEXT);
-					setIndex(variableNameText, newIndex);
-					variableNameText.setHorizontalAlignment(Orientation.ALIGNMENT_CENTER);
-					variableNameText.setVerticalAlignment(Orientation.ALIGNMENT_CENTER);
-					link(shapeText, field);
-					checkedShapes.add(shapes.size() - 1);
-				}
-			}
-
-			EList<Shape> shapes = ((ContainerShape) context.getPictogramElement()).getChildren();
-			int counter = 0;
-<<<<<<< HEAD
-			for (int i = 8; i < shapes.size(); i++) {
-=======
-			for (int i = numShapesOfEmptyClass; i < shapes.size(); i++) {
->>>>>>> master
-				if (!checkedShapes.contains(i)) {
-					Shape shape = shapes.get(i - counter);
-					int indexToDelete = getIndex(shape.getGraphicsAlgorithm());
-					for (Shape childShape : shapes) {
-						if (getIndex(childShape.getGraphicsAlgorithm()) > indexToDelete) {
-							setIndex(childShape.getGraphicsAlgorithm(),
-									getIndex(childShape.getGraphicsAlgorithm()) - 1);
-						}
-					}
-					EcoreUtil.delete(shape.getLink());
-					EcoreUtil.delete(shape);
-					counter++;
-				}
-			}
-			return true;
-		}
-		return false;
-	}
-	
-	public void setValue(String value, IDirectEditingContext context) {
-		ModelClass modelClass = (ModelClass) getBusinessObjectForPictogramElement(context.getPictogramElement());
-		String[] fragments = value.trim().split(" ");
-		//is new value valid?
-		if ((fragments.length != 3 && fragments.length != 1) || !fragments[0].equals(modelClass.getName())) {
-			return;
-		}
-		Resource inheritanceResource = null;
-		ModelClass parentClass = null;
-		if (fragments.length == 1) {
-			modelClass.setInheritsFrom(parentClass);
-		} else if (fragments.length == 3) {
-			if (fragments[1].equals("extends")) {
-				String path = FileUtil.getProjectLocation(getDiagram().eResource().getURI());
-				inheritanceResource = ClassUtil.getClassModelResource(path, fragments[2]);
-				if (inheritanceResource == null) {
-					return;
-				}
-				parentClass = (ModelClass) inheritanceResource.getContents().get(0);
-				modelClass.setInheritsFrom(parentClass);
-			}
-		}
-		updatePictogramElement(context.getPictogramElement());
-	}
-	
-	@Override
-	public String getInitialValue(IDirectEditingContext context) {
-		ModelClass mc = (ModelClass) getBusinessObjectForPictogramElement(context.getPictogramElement());
-		if (mc.getInheritsFrom() != null) {
-			return mc.getName() + " extends " + mc.getInheritsFrom().getName();
-		} else {
-			return mc.getName();
-		}
-	}
-}
\ No newline at end of file
diff --git a/de.tu-bs.cs.isf.cbcclass.tool/src/de/tu_bs/cs/isf/cbcclass/tool/propertiesview/BasicsSection.java.orig b/de.tu-bs.cs.isf.cbcclass.tool/src/de/tu_bs/cs/isf/cbcclass/tool/propertiesview/BasicsSection.java.orig
deleted file mode 100644
index f5401b2d3..000000000
--- a/de.tu-bs.cs.isf.cbcclass.tool/src/de/tu_bs/cs/isf/cbcclass/tool/propertiesview/BasicsSection.java.orig
+++ /dev/null
@@ -1,274 +0,0 @@
-package de.tu_bs.cs.isf.cbcclass.tool.propertiesview;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.graphiti.mm.pictograms.Diagram;
-import org.eclipse.graphiti.mm.pictograms.PictogramElement;
-import org.eclipse.graphiti.ui.platform.GFPropertySection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Device;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.ui.views.properties.tabbed.ITabbedPropertyConstants;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
-
-<<<<<<< HEAD
-import de.tu_bs.cs.isf.cbc.cbcclass.model.cbcclass.Field;
-import de.tu_bs.cs.isf.cbc.cbcclass.model.cbcclass.Method;
-import de.tu_bs.cs.isf.cbc.cbcclass.model.cbcclass.ModelClass;
-import de.tu_bs.cs.isf.cbc.cbcmodel.Condition;
-import de.tu_bs.cs.isf.cbc.util.FileUtil;
-import de.tu_bs.cs.isf.cbc.tool.diagram.CbCDiagramTypeProvider;
-import helper.ClassUtil;
-=======
-import de.tu_bs.cs.isf.cbc.cbcclass.Field;
-import de.tu_bs.cs.isf.cbc.cbcclass.Method;
-import de.tu_bs.cs.isf.cbc.cbcclass.ModelClass;
-import de.tu_bs.cs.isf.cbc.cbcmodel.Condition;
-import de.tu_bs.cs.isf.cbc.util.FileUtil;
-import de.tu_bs.cs.isf.cbc.util.ClassUtil;
-import de.tu_bs.cs.isf.cbc.tool.diagram.CbCDiagramTypeProvider;
->>>>>>> master
-
-public class BasicsSection extends GFPropertySection implements ITabbedPropertyConstants {
-	Display display = Display.getCurrent();// for UI updating of back-process
-	boolean variationalProject = false;
-	
-	// Defining the UI properties
-	private Label featureLabel;
-	private Label featureLabelText;
-	private Label blankLabel;
-	
-	private Label invariantLabel;
-	private List invariantList;
-	
-	private Label fieldLabel;
-	private List fieldList;
-	
-	private Label methodLabel;
-	private List methodList;
-<<<<<<< HEAD
-	
-	private Object bo;
-=======
->>>>>>> master
-
-	@Override
-	public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
-		super.createControls(parent, tabbedPropertySheetPage);
-		Device device = Display.getCurrent();
-		TabbedPropertySheetWidgetFactory factory = getWidgetFactory();
-
-		Composite composite = factory.createFlatFormComposite(parent);
-				
-		// Defining GridLayout for properties-view
-		GridLayout gridLayout = new GridLayout();
-		gridLayout.numColumns = 3;
-		gridLayout.verticalSpacing = 10;
-		composite.setLayout(gridLayout);
-		Color white = new Color (device, 255, 255, 255);
-		
-		// featureLabel
-		featureLabel = new Label(composite, SWT.PUSH);
-		featureLabel.setBackground(white);
-		featureLabel.setText("Current Feature: ");
-		
-		// featureLabelText
-		featureLabelText = new Label(composite, SWT.PUSH);
-		featureLabelText.setBackground(white);
-	
-		// blankLabel
-		blankLabel = new Label(composite, SWT.PUSH);
-		blankLabel.setBackground(white);
-		blankLabel.setForeground(white);
-		blankLabel.setText("blank");
-		
-		// invariantLabel
-		invariantLabel = new Label(composite, SWT.PUSH);
-		invariantLabel.setBackground(white);
-		invariantLabel.setText("Invariants from other features' implementation of this class: ");
-		
-		// fieldLabel
-		fieldLabel = new Label(composite, SWT.PUSH);
-		fieldLabel.setBackground(white);
-		fieldLabel.setText("Fields from other features' implementation of this class: ");
-				
-		// methodLabel
-		methodLabel = new Label(composite, SWT.PUSH);
-		methodLabel.setBackground(white);
-		methodLabel.setText("Methods from other features' implementation of this class: ");
-				
-		// invariantLabelText
-		invariantList = new List(composite, SWT.MULTI | SWT.BORDER | SWT.V_SCROLL);
-		invariantList.setItems();
-		int invariantListHeight = invariantList.getItemHeight() * 8;
-
-		Rectangle invariantTrim = invariantList.computeTrim(0, 0, 0, invariantListHeight);
-		GridData invariantLabelTextGridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-		invariantLabelTextGridData.heightHint = invariantTrim.height;
-		invariantList.setLayoutData(invariantLabelTextGridData);
-		invariantList.setBackground(white);
-		invariantList.addSelectionListener(new SelectionListener() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				// TODO Auto-generated method stub
-			}
-
-			@Override
-			public void widgetDefaultSelected(SelectionEvent e) {
-				// TODO Auto-generated method stub
-			}
-		});
-		
-		// fieldLabelText
-		fieldList = new List(composite, SWT.MULTI | SWT.BORDER | SWT.V_SCROLL);
-		fieldList.setItems();
-	    int fieldListHeight = fieldList.getItemHeight() * 8;
-
-	    Rectangle fieldTrim = fieldList.computeTrim(0, 0, 0, fieldListHeight);
-	    GridData fieldLabelTextGridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-	    fieldLabelTextGridData.heightHint = fieldTrim.height;
-	    fieldList.setLayoutData(fieldLabelTextGridData);
-	    fieldList.setBackground(white);
-	    fieldList.addSelectionListener(new SelectionListener() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				// TODO Auto-generated method stub
-			}
-
-			@Override
-			public void widgetDefaultSelected(SelectionEvent e) {
-				// TODO Auto-generated method stub	
-			}
-		});	
-	    
-	    // methodLabelText
-	 	methodList = new List(composite, SWT.MULTI | SWT.BORDER | SWT.V_SCROLL);
-	 	methodList.setItems();
-	 	int methodListHeight = methodList.getItemHeight() * 8;
-
-	 	Rectangle methodTrim = methodList.computeTrim(0, 0, 0, methodListHeight);
-	 	GridData methodLabelTextGridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-	 	methodLabelTextGridData.heightHint = methodTrim.height;
-	 	methodList.setLayoutData(methodLabelTextGridData);
-	 	methodList.setBackground(white);
-	 	methodList.addSelectionListener(new SelectionListener() {
-	 		@Override
-	 		public void widgetSelected(SelectionEvent e) {
-	 			// TODO Auto-generated method stub
-	 		}
-
-	 		@Override
-	 		public void widgetDefaultSelected(SelectionEvent e) {
-	 			// TODO Auto-generated method stub	
-	 		}
-	 	});	
-	}
-
-	@Override
-	public void refresh() {
-		CbCDiagramTypeProvider diagramProvider = new CbCDiagramTypeProvider();
-		PictogramElement pe = getSelectedPictogramElement();
-<<<<<<< HEAD
-		bo = diagramProvider.getFeatureProvider().getBusinessObjectForPictogramElement(pe);
-=======
-		diagramProvider.getFeatureProvider().getBusinessObjectForPictogramElement(pe);
->>>>>>> master
-		if (pe instanceof Diagram) {
-			updateData(pe);
-		}
-	}	
-
-	public void updateData(Object pe) {
-		display.syncExec(new Runnable() {
-			@Override
-			public void run() {
-				// update current feature, invariants & fields from other features
-				String className = ((Diagram) pe).getName();
-				URI uri = getDiagram().eResource().getURI();
-				IProject project = FileUtil.getProjectFromFileInProject(uri);
-				
-				String featureName = uri.segment(3);
-				featureLabelText.setText(featureName);
-				
-				int sizeInvariants = 0;
-				int sizeFields = 0;
-				int sizeMethods = 0;
-				
-				java.util.List<IFile> classFiles = ClassUtil.getFilesOfType(project, ".cbcclass");
-				for (IFile cbcclassFile : classFiles) {
-					if (cbcclassFile.getName().replace(".cbcclass", "").equals(className)) {
-					String cbcclassPath = project.getLocationURI().toString().substring(6);// + "/" + cbcclassFile.getFullPath().segment(1) + "/" + cbcclassFile.getFullPath().segment(2) + "/" + cbcclassFile.getFullPath().segment(3) + "/" + cbcclassFile.getFullPath().segment(4);	
-					Resource resource = ClassUtil.getClassModelResource(cbcclassPath, className, cbcclassFile.getFullPath().segment(2));
-					if (resource != null) {
-					for (EObject obj: resource.getContents()) {
-						if (obj instanceof ModelClass) {
-							ModelClass mc = (ModelClass) obj;
-							if (mc.getFeature().equals(featureName)) {
-								break;
-							}
-							sizeInvariants += mc.getClassInvariants().size();
-							sizeFields += mc.getFields().size();
-							for (Method m : mc.getMethods()) {
-								sizeMethods++;
-							}
-						}
-					}
-					}
-					}
-				}
-				
-				String[] invariants = new String[sizeInvariants];
-				int invariantsCounter = 0;
-				String[] fields = new String[sizeFields];
-				int fieldsCounter = 0;
-				String[] methods = new String[sizeMethods];
-				int methodsCounter = 0;
-				for (IFile cbcclassFile : classFiles) {
-					if (cbcclassFile.getName().replace(".cbcclass", "").equals(className)) {
-					String cbcclassPath = project.getLocationURI().toString().substring(6);
-					Resource resource = ClassUtil.getClassModelResource(cbcclassPath, className, cbcclassFile.getFullPath().segment(2));
-					if (resource != null) {
-					for (EObject obj: resource.getContents()) {
-						if (obj instanceof ModelClass) {
-							ModelClass mc = (ModelClass) obj;
-							if (mc.getFeature().equals(featureName)) {
-								break;
-							}
-							EList<Condition> classInvariants = mc.getClassInvariants();
-							for (int i = 0; i < classInvariants.size(); i++){
-								invariants[invariantsCounter++] = classInvariants.get(i).getName() + " (" + mc.getFeature() + ")";
-							}
-							EList<Field> classFields = mc.getFields();
-							for (int i = 0; i < classFields.size(); i++){
-								fields[fieldsCounter++] = classFields.get(i).getDisplayedName() + " (" + mc.getFeature() + ")";
-							}
-							EList<Method> classMethods = mc.getMethods();
-							for (int i = 0; i < classMethods.size(); i++){
-								methods[methodsCounter++] = classMethods.get(i).getSignature()  + " (" + mc.getFeature() + ")";
-							}
-						}
-					}
-					}
-					}
-				}
-				invariantList.setItems(invariants);
-				fieldList.setItems(fields);
-				methodList.setItems(methods);
-			}
-		});
-	}
-}
\ No newline at end of file
diff --git a/de.tu-bs.cs.isf.wizards/.project.orig b/de.tu-bs.cs.isf.wizards/.project.orig
deleted file mode 100644
index 70584699d..000000000
--- a/de.tu-bs.cs.isf.wizards/.project.orig
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-<<<<<<< HEAD
-	<name>de.tu-bs.cs.isf.extensions</name>
-=======
-	<name>de.tu-bs.cs.isf.wizards</name>
->>>>>>> master
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/de.tu-bs.cs.isf.wizards/META-INF/MANIFEST.MF.orig b/de.tu-bs.cs.isf.wizards/META-INF/MANIFEST.MF.orig
deleted file mode 100644
index dd396ad35..000000000
--- a/de.tu-bs.cs.isf.wizards/META-INF/MANIFEST.MF.orig
+++ /dev/null
@@ -1,44 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: ExampleWizard
-Bundle-SymbolicName: de.tu-bs.cs.isf.wizards;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-16
-Import-Package: com.google.common.io;version="2.2.0",
- de.tu_bs.cs.isf.cbc.cbcmodel,
-<<<<<<< HEAD
- de.tu_bs.cs.isf.cbc.tool.diagram,
- de.tu_bs.cs.isf.cbc.tool.helper,
- de.tu_bs.cs.isf.cbc.util,
-=======
->>>>>>> master
- org.eclipse.core.resources,
- org.eclipse.core.runtime;version="3.5.0",
- org.eclipse.emf.ecore.resource,
- org.eclipse.emf.ecore.resource.impl,
- org.eclipse.graphiti.features.context;version="0.13.2",
- org.eclipse.graphiti.mm.pictograms;version="0.13.2",
- org.eclipse.graphiti.services;version="0.13.2",
- org.eclipse.jdt.core,
- org.eclipse.jface.dialogs,
- org.eclipse.jface.viewers,
- org.eclipse.jface.wizard,
- org.eclipse.swt.events,
- org.eclipse.swt.graphics,
- org.eclipse.swt.layout,
- org.eclipse.swt.widgets,
- org.eclipse.ui.internal,
- org.osgi.framework;version="1.8.0"
-Export-Package: de.tu_bs.cs.isf.corc.exampleWizard,
- de.tu_bs.cs.isf.corc.newFileWizard,
-<<<<<<< HEAD
- de.tu_bs.cs.isf.corc.predicateWizard
-Require-Bundle: org.eclipse.emf.common;bundle-version="2.12.0",
- org.eclipse.jface
-=======
- newDiagramWizard
-Require-Bundle: org.eclipse.emf.common;bundle-version="2.12.0",
- org.eclipse.jface,
- org.eclipse.ui,
- org.eclipse.swt
->>>>>>> master
diff --git a/de.tu-bs.cs.isf.wizards/examples/Exponentation.diagram.orig b/de.tu-bs.cs.isf.wizards/examples/Exponentation.diagram.orig
deleted file mode 100644
index 9bd024ca0..000000000
--- a/de.tu-bs.cs.isf.wizards/examples/Exponentation.diagram.orig
+++ /dev/null
@@ -1,2341 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<<<<<<< HEAD
-<pi:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:al="http://eclipse.org/graphiti/mm/algorithms" xmlns:pi="http://eclipse.org/graphiti/mm/pictograms" visible="true" gridUnit="10" diagramTypeId="cbc" name="Exponentation" snapToGrid="true" pictogramLinks="//@children.0/@link //@link //@children.0/@children.0/@link //@children.0/@children.1/@link //@children.0/@children.2/@link //@children.0/@children.4/@link //@children.1/@link //@children.1/@children.0/@link //@children.1/@children.2/@link //@children.2/@link //@children.2/@children.0/@link //@children.2/@children.2/@link //@children.3/@link //@children.3/@children.0/@link //@children.3/@children.8/@link //@children.3/@children.9/@link //@children.3/@children.10/@link //@children.1/@children.3/@link //@children.1/@children.4/@link //@children.1/@children.5/@link //@children.1/@children.6/@link //@children.2/@children.3/@link //@children.2/@children.4/@link //@children.4/@link //@children.4/@children.1/@link //@children.4/@children.0/@link //@children.4/@children.2/@link //@children.4/@children.4/@link //@children.4/@children.5/@link //@children.4/@children.6/@link //@children.5/@link //@children.5/@children.0/@link //@children.5/@children.1/@link //@children.5/@children.2/@link //@children.5/@children.3/@link //@children.6/@link //@children.6/@children.1/@link //@children.6/@children.0/@link //@children.6/@children.3/@link //@children.6/@children.2/@link //@children.6/@children.5/@link //@children.6/@children.6/@link //@children.6/@children.7/@link //@children.7/@link //@children.7/@children.1/@link //@children.7/@children.14/@link //@children.7/@children.15/@link //@children.7/@children.16/@link //@children.7/@children.20/@link //@children.7/@children.21/@link //@children.7/@children.22/@link //@children.7/@children.23/@link //@children.7/@children.27/@link //@children.8/@link //@children.8/@children.0/@link //@children.8/@children.1/@link //@children.8/@children.2/@link //@children.8/@children.3/@link //@children.9/@link //@children.9/@children.0/@link //@children.9/@children.1/@link //@children.9/@children.2/@link //@children.9/@children.3/@link" version="0.18.0">
-=======
-<pi:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:al="http://eclipse.org/graphiti/mm/algorithms" xmlns:pi="http://eclipse.org/graphiti/mm/pictograms" visible="true" gridUnit="10" diagramTypeId="cbc" name="Exponentation" snapToGrid="true" pictogramLinks="//@children.0/@link //@link //@children.0/@children.0/@link //@children.0/@children.1/@link //@children.0/@children.2/@link //@children.0/@children.3/@link //@children.0/@children.4/@link //@children.0/@children.6/@link //@children.0/@children.7/@link //@children.1/@link //@children.1/@children.0/@link //@children.1/@children.2/@link //@children.1/@children.3/@link //@children.1/@children.4/@link //@children.1/@children.5/@link //@children.1/@children.6/@link //@children.2/@link //@children.2/@children.0/@link //@children.2/@children.2/@link //@children.2/@children.3/@link //@children.2/@children.4/@link //@children.3/@link //@children.3/@children.0/@link //@children.3/@children.8/@link //@children.3/@children.9/@link //@children.3/@children.10/@link //@children.4/@link //@children.4/@children.1/@link //@children.4/@children.2/@link //@children.4/@children.0/@link //@children.4/@children.3/@link //@children.4/@children.5/@link //@children.4/@children.6/@link //@children.4/@children.7/@link //@children.4/@children.8/@link //@children.4/@children.9/@link //@children.5/@link //@children.5/@children.0/@link //@children.5/@children.1/@link //@children.5/@children.2/@link //@children.5/@children.3/@link //@children.5/@children.4/@link //@children.5/@children.5/@link //@children.6/@link //@children.6/@children.1/@link //@children.6/@children.0/@link //@children.6/@children.3/@link //@children.6/@children.2/@link //@children.6/@children.5/@link //@children.6/@children.6/@link //@children.6/@children.7/@link //@children.6/@children.8/@link //@children.6/@children.9/@link //@children.7/@link //@children.7/@children.1/@link //@children.7/@children.16/@link //@children.7/@children.17/@link //@children.7/@children.18/@link //@children.7/@children.19/@link //@children.7/@children.20/@link //@children.7/@children.24/@link //@children.7/@children.25/@link //@children.7/@children.26/@link //@children.7/@children.27/@link //@children.7/@children.28/@link //@children.7/@children.29/@link //@children.7/@children.33/@link //@children.8/@link //@children.8/@children.0/@link //@children.8/@children.1/@link //@children.8/@children.2/@link //@children.8/@children.3/@link //@children.8/@children.4/@link //@children.8/@children.5/@link //@children.9/@link //@children.9/@children.0/@link //@children.9/@children.1/@link //@children.9/@children.2/@link //@children.9/@children.3/@link //@children.9/@children.4/@link //@children.9/@children.5/@link" version="0.18.0">
->>>>>>> master
-  <graphicsAlgorithm xsi:type="al:Rectangle" background="//@colors.1" foreground="//@colors.0" lineWidth="1" transparency="0.0" width="1000" height="1000"/>
-  <link>
-    <businessObjects href="Exponentation.cbcmodel#/0"/>
-  </link>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-<<<<<<< HEAD
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="441" height="125" x="120" y="15" cornerHeight="20" cornerWidth="20">
-=======
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="400" height="200" x="30" y="20" cornerHeight="20" cornerWidth="20">
->>>>>>> master
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="Exponentation.cbcmodel#/0"/>
-    </link>
-    <children visible="true" active="true">
-<<<<<<< HEAD
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="147" height="65" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="{n > 0}">
-=======
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="133" height="94" y="106" horizontalAlignment="ALIGNMENT_CENTER" value="{n > 0}">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/0/@statement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-<<<<<<< HEAD
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="147" height="65" x="147" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
-=======
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="133" height="46" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable();">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preConditionModifiables"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/0/@statement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="133" height="140" x="133" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementNameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/0/@statement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.5"/>
-    </children>
-    <children visible="true" active="true">
-<<<<<<< HEAD
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="147" height="65" x="294" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(b,i,z);&#xD;&#xA;i = 0 &amp; z * pow(b,i) = pow(a,n)}">
-=======
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="133" height="94" x="266" y="106" horizontalAlignment="ALIGNMENT_CENTER" value="{i = 0 &amp; z * pow(b,i) = pow(a,n)}">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postConditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/0/@statement/@postCondition"/>
-      </link>
-    </children>
-<<<<<<< HEAD
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="441" height="30" y="5" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Formula">
-=======
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="133" height="46" x="266" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable(b, i, z);">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postConditionModifiables"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/0/@statement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="400" height="30" y="5" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Formula">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="nameText"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-<<<<<<< HEAD
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="421" y="10" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-=======
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="380" y="10" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/0"/>
-      </link>
-    </children>
-    <children visible="true">
-<<<<<<< HEAD
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="147" height="20" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-=======
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="1.0" width="19" height="20" x="10" y="10" id="de.tu_bs.cs.isf.cbc.tool.inheritance" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageinheritance"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/0"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="133" height="20" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-<<<<<<< HEAD
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="147" height="20" x="294" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-=======
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="133" height="20" x="266" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-<<<<<<< HEAD
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="147" height="20" x="147" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
-=======
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="133" height="20" x="133" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="stHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-        <points y="40"/>
-<<<<<<< HEAD
-        <points x="441" y="40"/>
-=======
-        <points x="400" y="40"/>
->>>>>>> master
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor2Line"/>
-        <points y="60"/>
-<<<<<<< HEAD
-        <points x="441" y="60"/>
-=======
-        <points x="400" y="60"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor3Line"/>
-        <points y="106"/>
-        <points x="133" y="106"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor4Line"/>
-        <points x="266" y="106"/>
-        <points x="400" y="106"/>
->>>>>>> master
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver1Line"/>
-<<<<<<< HEAD
-        <points x="147" y="40"/>
-        <points x="147" y="125"/>
-=======
-        <points x="133" y="40"/>
-        <points x="133" y="200"/>
->>>>>>> master
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver2Line"/>
-<<<<<<< HEAD
-        <points x="294" y="40"/>
-        <points x="294" y="125"/>
-=======
-        <points x="266" y="40"/>
-        <points x="266" y="200"/>
->>>>>>> master
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-<<<<<<< HEAD
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" lineWidth="1" filled="true" transparency="0.0" width="160" height="156" x="620" y="15" cornerHeight="20" cornerWidth="20">
-=======
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" lineWidth="1" filled="true" transparency="0.0" width="200" height="100" x="460" y="20" cornerHeight="20" cornerWidth="20">
->>>>>>> master
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="Exponentation.cbcmodel#/1"/>
-    </link>
-    <children visible="true">
-<<<<<<< HEAD
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="160" height="26" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Variables">
-=======
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="16" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Variables">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variablesName"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/1"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-<<<<<<< HEAD
-        <points y="26"/>
-        <points x="160" y="26"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="160" height="26" y="130" horizontalAlignment="ALIGNMENT_CENTER" value="LOCAL int n">
-=======
-        <points y="16"/>
-        <points x="200" y="16"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="16" y="80" horizontalAlignment="ALIGNMENT_CENTER" value="LOCAL int n">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="4"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/1/@variables.0"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-<<<<<<< HEAD
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="160" height="26" y="104" horizontalAlignment="ALIGNMENT_CENTER" value="LOCAL int i">
-=======
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="16" y="64" horizontalAlignment="ALIGNMENT_CENTER" value="LOCAL int i">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="3"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/1/@variables.1"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-<<<<<<< HEAD
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="160" height="26" y="78" horizontalAlignment="ALIGNMENT_CENTER" value="LOCAL int b">
-=======
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="16" y="48" horizontalAlignment="ALIGNMENT_CENTER" value="LOCAL int b">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="2"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/1/@variables.2"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-<<<<<<< HEAD
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="160" height="26" y="52" horizontalAlignment="ALIGNMENT_CENTER" value="LOCAL int z">
-=======
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="16" y="32" horizontalAlignment="ALIGNMENT_CENTER" value="LOCAL int z">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/1/@variables.3"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-<<<<<<< HEAD
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="160" height="26" y="26" horizontalAlignment="ALIGNMENT_CENTER" value="LOCAL int a">
-=======
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="16" y="16" horizontalAlignment="ALIGNMENT_CENTER" value="LOCAL int a">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variable"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/1/@variables.4"/>
-      </link>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-<<<<<<< HEAD
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" lineWidth="1" filled="true" transparency="0.0" width="181" height="156" x="790" y="15" cornerHeight="20" cornerWidth="20">
-=======
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" lineWidth="1" filled="true" transparency="0.0" width="200" height="100" x="700" y="20" cornerHeight="20" cornerWidth="20">
->>>>>>> master
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="Exponentation.cbcmodel#/2"/>
-    </link>
-    <children visible="true">
-<<<<<<< HEAD
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="181" height="39" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Global Conditions">
-=======
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="200" height="25" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Global Conditions">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="globalConditionsName"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/2"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-<<<<<<< HEAD
-        <points y="39"/>
-        <points x="181" y="39"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="181" height="39" y="39" horizontalAlignment="ALIGNMENT_CENTER" value="n > 0 &amp; a > 0">
-=======
-        <points y="25"/>
-        <points x="200" y="25"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="200" height="25" y="25" horizontalAlignment="ALIGNMENT_CENTER" value="n > 0 &amp; a > 0">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="globalcondition"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/2/@conditions.0"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-<<<<<<< HEAD
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="181" height="39" y="78" horizontalAlignment="ALIGNMENT_CENTER" value="n &lt; 6 &amp; a &lt; 6">
-=======
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="200" height="25" y="50" horizontalAlignment="ALIGNMENT_CENTER" value="n &lt; 6 &amp; a &lt; 6">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="globalcondition"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/2/@conditions.1"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-<<<<<<< HEAD
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="181" height="39" y="117" horizontalAlignment="ALIGNMENT_CENTER" value="i >= 0 &amp; i &lt; n">
-=======
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="200" height="25" y="75" horizontalAlignment="ALIGNMENT_CENTER" value="i >= 0 &amp; i &lt; n">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="globalcondition"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="2"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/2/@conditions.2"/>
-      </link>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-<<<<<<< HEAD
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" lineWidth="1" filled="true" transparency="0.0" width="400" height="150" x="620" y="190" cornerHeight="20" cornerWidth="20">
-=======
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" lineWidth="1" filled="true" transparency="0.0" width="400" height="150" x="500" y="140" cornerHeight="20" cornerWidth="20">
->>>>>>> master
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="Exponentation.cbcmodel#/3"/>
-    </link>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="400" height="50" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Renaming">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="RenamingName"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/3"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="133" height="50" y="50" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="data type">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="typeHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="133" height="50" x="133" y="50" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="original name">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="destinationHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="133" height="50" x="266" y="50" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="renamed">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="renamedHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Header"/>
-        <points y="50"/>
-        <points x="400" y="50"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor2Header"/>
-        <points y="100"/>
-        <points x="400" y="100"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver1Header"/>
-        <points x="133" y="50"/>
-        <points x="133" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver2Header"/>
-        <points x="266" y="50"/>
-        <points x="266" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="133" height="50" x="133" y="100" horizontalAlignment="ALIGNMENT_CENTER" value="Helper.pow">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="functionName"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/3/@rename.0"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="133" height="50" y="100" horizontalAlignment="ALIGNMENT_CENTER" value="int">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="functionType"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/3/@rename.0"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="133" height="50" x="266" y="100" horizontalAlignment="ALIGNMENT_CENTER" value="pow">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="newFunctionName"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/3/@rename.0"/>
-      </link>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-<<<<<<< HEAD
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="500" height="300" x="91" y="160" cornerHeight="20" cornerWidth="20">
-=======
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="500" height="350" x="-10" y="239" cornerHeight="20" cornerWidth="20">
->>>>>>> master
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="Exponentation.cbcmodel#/0/@statement/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.5"/>
-    <children visible="true" active="true">
-<<<<<<< HEAD
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="100" y="200" horizontalAlignment="ALIGNMENT_CENTER" value="statement1">
-=======
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="135" y="215" horizontalAlignment="ALIGNMENT_CENTER" value="statement1">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement1NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/0/@statement/@refinement/@firstStatement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.3"/>
-    </children>
-    <children visible="true" active="true">
-<<<<<<< HEAD
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="100" x="166" y="200" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(b,i,z);&#xD;&#xA;z * pow(b,i) = pow(a,n)}">
-=======
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="90" x="166" y="260" horizontalAlignment="ALIGNMENT_CENTER" value="{z * pow(b,i) = pow(a,n)}">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="conditionText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/0/@statement/@refinement/@intermediateCondition"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-<<<<<<< HEAD
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="100" x="332" y="200" horizontalAlignment="ALIGNMENT_CENTER" value="statement2">
-=======
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="45" x="166" y="215" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable(b, i, z);">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="otherConditionModifiables"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/0/@statement/@refinement/@intermediateCondition"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="166" height="135" x="332" y="215" horizontalAlignment="ALIGNMENT_CENTER" value="statement2">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement2NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/0/@statement/@refinement/@secondStatement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.4"/>
-    </children>
-    <children visible="true">
-<<<<<<< HEAD
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="500" height="60" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Composition">
-=======
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="500" height="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Composition">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="nameText"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-<<<<<<< HEAD
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="100" y="80" horizontalAlignment="ALIGNMENT_CENTER" value="{n > 0}">
-=======
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="90" y="105" horizontalAlignment="ALIGNMENT_CENTER" value="{n > 0}">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="pre1NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/0/@statement/@refinement/@firstStatement/@preCondition"/>
-      </link>
-    </children>
-<<<<<<< HEAD
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="100" x="250" y="80" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(b,i,z);&#xD;&#xA;i = 0 &amp; z * pow(b,i) = pow(a,n)}">
-=======
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="45" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable();">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preConditionModifiables"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/0/@statement/@refinement/@firstStatement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="90" x="250" y="105" horizontalAlignment="ALIGNMENT_CENTER" value="{i = 0 &amp; z * pow(b,i) = pow(a,n)}">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="post2NameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/0/@statement/@refinement/@secondStatement/@postCondition"/>
-      </link>
-    </children>
-<<<<<<< HEAD
-=======
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="250" height="45" x="250" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable(b, i, z);">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postConditionModifiables"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/0/@statement/@refinement/@secondStatement/@postCondition"/>
-      </link>
-    </children>
->>>>>>> master
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="480" y="10" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/0/@statement/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-<<<<<<< HEAD
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" y="60" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-=======
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-<<<<<<< HEAD
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" x="250" y="60" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-=======
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="250" height="20" x="250" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-<<<<<<< HEAD
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="166" height="20" y="180" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement 1">
-=======
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="166" height="20" y="195" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement 1">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement1Header"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-<<<<<<< HEAD
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="166" height="20" x="332" y="180" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement 2">
-=======
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="166" height="20" x="332" y="195" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement 2">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statement2Header"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-<<<<<<< HEAD
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="166" height="20" x="166" y="180" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="intermediate condition">
-=======
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="166" height="20" x="166" y="195" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="intermediate condition">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="intermediateCondHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-<<<<<<< HEAD
-=======
-        <points y="40"/>
-        <points x="500" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor2Line"/>
->>>>>>> master
-        <points y="60"/>
-        <points x="500" y="60"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-<<<<<<< HEAD
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor2Line"/>
-        <points y="80"/>
-        <points x="500" y="80"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor3Line"/>
-        <points y="180"/>
-        <points x="500" y="180"/>
-=======
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor3Line"/>
-        <points y="195"/>
-        <points x="500" y="195"/>
->>>>>>> master
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor4Line"/>
-<<<<<<< HEAD
-        <points y="200"/>
-        <points x="500" y="200"/>
-=======
-        <points y="215"/>
-        <points x="500" y="215"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor5Line"/>
-        <points x="166" y="260"/>
-        <points x="332" y="260"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor6Line"/>
-        <points y="105"/>
-        <points x="250" y="105"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor7Line"/>
-        <points x="250" y="105"/>
-        <points x="500" y="105"/>
->>>>>>> master
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver1Line"/>
-<<<<<<< HEAD
-        <points x="250" y="60"/>
-        <points x="250" y="180"/>
-=======
-        <points x="250" y="40"/>
-        <points x="250" y="195"/>
->>>>>>> master
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver2Line"/>
-<<<<<<< HEAD
-        <points x="166" y="180"/>
-        <points x="166" y="300"/>
-=======
-        <points x="166" y="195"/>
-        <points x="166" y="350"/>
->>>>>>> master
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver3Line"/>
-<<<<<<< HEAD
-        <points x="332" y="180"/>
-        <points x="332" y="300"/>
-=======
-        <points x="332" y="195"/>
-        <points x="332" y="350"/>
->>>>>>> master
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-<<<<<<< HEAD
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="391" height="101" x="20" y="500" cornerHeight="20" cornerWidth="20">
-=======
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="350" height="150" x="-160" y="630" cornerHeight="20" cornerWidth="20">
->>>>>>> master
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="Exponentation.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.3"/>
-    <children visible="true" active="true">
-<<<<<<< HEAD
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="130" height="61" x="130" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="i = n-1; b = a; z = a;">
-=======
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="116" height="110" x="116" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="i = n-1; b = a; z = a;">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-<<<<<<< HEAD
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="130" height="61" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{n > 0}">
-=======
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="116" height="72" y="76" horizontalAlignment="ALIGNMENT_CENTER" value="{n > 0}">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement/@preCondition"/>
-      </link>
-    </children>
-<<<<<<< HEAD
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="130" height="61" x="260" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(b,i,z); z * pow(b,i) = pow(a,n)}">
-=======
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="116" height="36" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable();">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preConditionModifiables"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="116" height="72" x="232" y="76" horizontalAlignment="ALIGNMENT_CENTER" value="{z * pow(b,i) = pow(a,n)}">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement/@postCondition"/>
-      </link>
-    </children>
-<<<<<<< HEAD
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="371" y="10" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-=======
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="116" height="36" x="232" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable(b, i, z);">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postConditionModifiables"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="330" y="10" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/0/@statement/@refinement/@firstStatement/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-<<<<<<< HEAD
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="130" height="20" x="130" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
-=======
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="116" height="20" x="116" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Statement">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-<<<<<<< HEAD
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="130" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-=======
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="116" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-<<<<<<< HEAD
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="130" height="20" x="260" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-=======
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="116" height="20" x="232" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerSeparater"/>
-        <points y="40"/>
-<<<<<<< HEAD
-        <points x="391" y="40"/>
-=======
-        <points x="350" y="40"/>
->>>>>>> master
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preSep"/>
-<<<<<<< HEAD
-        <points x="260"/>
-        <points x="260" y="101"/>
-=======
-        <points x="232"/>
-        <points x="232" y="150"/>
->>>>>>> master
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postSep"/>
-<<<<<<< HEAD
-        <points x="130"/>
-        <points x="130" y="101"/>
-=======
-        <points x="116"/>
-        <points x="116" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-        <points y="76"/>
-        <points x="116" y="76"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor2Line"/>
-        <points x="232" y="76"/>
-        <points x="350" y="76"/>
->>>>>>> master
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-<<<<<<< HEAD
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="300" height="300" x="450" y="500" cornerHeight="20" cornerWidth="20">
-=======
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="450" height="350" x="260" y="630" cornerHeight="20" cornerWidth="20">
->>>>>>> master
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="Exponentation.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.4"/>
-    <children visible="true" active="true">
-<<<<<<< HEAD
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="100" x="100" y="200" horizontalAlignment="ALIGNMENT_CENTER" value="loop">
-=======
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="186" x="150" y="164" horizontalAlignment="ALIGNMENT_CENTER" value="loop">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementRepNameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@loopStatement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.2"/>
-    </children>
-    <children visible="true" active="true">
-<<<<<<< HEAD
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="100" x="100" y="80" horizontalAlignment="ALIGNMENT_CENTER" value="i != 0">
-=======
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="83" x="150" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="i != 0">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="conditionRepText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@guard"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-<<<<<<< HEAD
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="100" y="80" horizontalAlignment="ALIGNMENT_CENTER" value="z * pow(b,i) = pow(a,n)">
-=======
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="83" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="z * pow(b,i) = pow(a,n)">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="invariantRepText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@invariant"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-<<<<<<< HEAD
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="100" x="200" y="80" horizontalAlignment="ALIGNMENT_CENTER" value="i">
-=======
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="83" x="300" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="i">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variantRepText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@variant"/>
-      </link>
-    </children>
-    <children visible="true">
-<<<<<<< HEAD
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="300" height="60" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="RepetitionStatement DO...OD">
-=======
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="450" height="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="RepetitionStatement DO...OD">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="nameText"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-<<<<<<< HEAD
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="100" y="200" horizontalAlignment="ALIGNMENT_CENTER" value="{(z * pow(b,i) = pow(a,n)) &amp; (i != 0)}">
-=======
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="124" y="226" horizontalAlignment="ALIGNMENT_CENTER" value="{(z * pow(b,i) = pow(a,n)) &amp; (i != 0)}">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preNameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@loopStatement/@preCondition"/>
-      </link>
-    </children>
-<<<<<<< HEAD
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="100" height="100" x="200" y="200" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(b,i,z);&#xD;&#xA;z * pow(b,i) = pow(a,n)}">
-=======
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="62" y="164" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable(b, i, z);">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preConditionModifiables"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="124" x="300" y="226" horizontalAlignment="ALIGNMENT_CENTER" value="{z * pow(b,i) = pow(a,n)}">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postNameText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@loopStatement/@postCondition"/>
-      </link>
-    </children>
-<<<<<<< HEAD
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="280" y="10" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-=======
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="150" height="62" x="300" y="164" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable(b, i, z);">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postConditionModifiables"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@loopStatement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="430" y="10" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-<<<<<<< HEAD
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="200" y="60" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="variant">
-=======
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="300" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="variant">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="variantHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-<<<<<<< HEAD
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" y="60" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="invariant">
-=======
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="invariant">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="invariantHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-<<<<<<< HEAD
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="100" y="60" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="guard">
-=======
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="150" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="guard">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="guardHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-<<<<<<< HEAD
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="100" y="180" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="loop statement">
-=======
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="150" y="144" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="loop statement">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="loopHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-<<<<<<< HEAD
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" x="200" y="180" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-=======
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" x="300" y="144" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-<<<<<<< HEAD
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="100" height="20" y="180" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-=======
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="150" height="20" y="144" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver1SEP"/>
-<<<<<<< HEAD
-        <points x="100" y="60"/>
-        <points x="100" y="300"/>
-=======
-        <points x="150" y="40"/>
-        <points x="150" y="350"/>
->>>>>>> master
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver2SEP"/>
-<<<<<<< HEAD
-        <points x="200" y="60"/>
-        <points x="200" y="300"/>
-=======
-        <points x="300" y="40"/>
-        <points x="300" y="350"/>
->>>>>>> master
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1SEP"/>
-<<<<<<< HEAD
-        <points y="80"/>
-        <points x="300" y="80"/>
-=======
-        <points y="60"/>
-        <points x="450" y="60"/>
->>>>>>> master
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor2SEP"/>
-<<<<<<< HEAD
-        <points y="60"/>
-        <points x="300" y="60"/>
-=======
-        <points y="40"/>
-        <points x="450" y="40"/>
->>>>>>> master
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor3SEP"/>
-<<<<<<< HEAD
-        <points y="180"/>
-        <points x="300" y="180"/>
-=======
-        <points y="144"/>
-        <points x="450" y="144"/>
->>>>>>> master
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor4SEP"/>
-<<<<<<< HEAD
-        <points y="200"/>
-        <points x="300" y="200"/>
-=======
-        <points y="164"/>
-        <points x="450" y="164"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor5SEP"/>
-        <points y="226"/>
-        <points x="150" y="226"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor6SEP"/>
-        <points x="300" y="226"/>
-        <points x="450" y="226"/>
->>>>>>> master
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-<<<<<<< HEAD
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="350" height="300" x="430" y="840" cornerHeight="20" cornerWidth="20">
-=======
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="450" height="500" x="260" y="1000" cornerHeight="20" cornerWidth="20">
->>>>>>> master
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="Exponentation.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@loopStatement/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.2"/>
-    <children visible="true">
-<<<<<<< HEAD
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="350" height="40" horizontalAlignment="ALIGNMENT_CENTER" value="SelectionStatement IF..FI">
-=======
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="450" height="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="SelectionStatement IF..FI">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="nameText"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-<<<<<<< HEAD
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="330" y="10" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-=======
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="430" y="10" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@loopStatement/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-<<<<<<< HEAD
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="350" height="20" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="guards">
-=======
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="450" height="20" y="40" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="guards">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="guardHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-<<<<<<< HEAD
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="350" height="20" y="105" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-=======
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="450" height="20" y="155" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-<<<<<<< HEAD
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="350" height="20" y="170" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statements">
-=======
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="450" height="20" y="270" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statements">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-<<<<<<< HEAD
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="350" height="20" y="235" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-=======
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="450" height="20" y="385" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-        <points y="40"/>
-<<<<<<< HEAD
-        <points x="350" y="40"/>
-=======
-        <points x="450" y="40"/>
->>>>>>> master
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor2Line"/>
-        <points y="60"/>
-<<<<<<< HEAD
-        <points x="350" y="60"/>
-=======
-        <points x="450" y="60"/>
->>>>>>> master
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor3Line"/>
-<<<<<<< HEAD
-        <points y="105"/>
-        <points x="350" y="105"/>
-=======
-        <points y="155"/>
-        <points x="450" y="155"/>
->>>>>>> master
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor4Line"/>
-<<<<<<< HEAD
-        <points y="125"/>
-        <points x="350" y="125"/>
-=======
-        <points y="175"/>
-        <points x="450" y="175"/>
->>>>>>> master
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor5Line"/>
-<<<<<<< HEAD
-        <points y="170"/>
-        <points x="350" y="170"/>
-=======
-        <points y="270"/>
-        <points x="450" y="270"/>
->>>>>>> master
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor6Line"/>
-<<<<<<< HEAD
-        <points y="190"/>
-        <points x="350" y="190"/>
-=======
-        <points y="290"/>
-        <points x="450" y="290"/>
->>>>>>> master
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor7Line"/>
-<<<<<<< HEAD
-        <points y="235"/>
-        <points x="350" y="235"/>
-=======
-        <points y="385"/>
-        <points x="450" y="385"/>
->>>>>>> master
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor8Line"/>
-<<<<<<< HEAD
-        <points y="255"/>
-        <points x="350" y="255"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="175" height="45" y="190" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
-=======
-        <points y="405"/>
-        <points x="450" y="405"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor9Line"/>
-        <points y="206"/>
-        <points x="450" y="206"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor10Line"/>
-        <points y="436"/>
-        <points x="450" y="436"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="225" height="95" y="290" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementSelNameText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@loopStatement/@refinement/@commands.0"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.1"/>
-    </children>
-    <children visible="true">
-<<<<<<< HEAD
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="175" height="45" y="125" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(\nothing);((z * pow(b,i) = pow(a,n)) &amp; (i != 0)) &amp; (i%2 = 0)}">
-=======
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="225" height="62" y="206" horizontalAlignment="ALIGNMENT_CENTER" value="{((z * pow(b,i) = pow(a,n)) &amp; (i != 0)) &amp; (i%2 = 0)}">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@loopStatement/@refinement/@commands.0/@preCondition"/>
-      </link>
-    </children>
-<<<<<<< HEAD
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="350" height="45" y="255" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(b,i,z);&#xD;&#xA;z * pow(b,i) = pow(a,n)}">
-=======
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="450" height="31" y="175" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable(b, i, z);">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preConditionModifiables"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@loopStatement/@refinement/@commands.0/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="450" height="62" y="436" horizontalAlignment="ALIGNMENT_CENTER" value="{z * pow(b,i) = pow(a,n)}">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@loopStatement/@refinement/@commands.0/@postCondition"/>
-      </link>
-    </children>
-<<<<<<< HEAD
-=======
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="450" height="31" y="405" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable(b, i, z);">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postConditionModifiables"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@loopStatement/@refinement/@commands.0/@postCondition"/>
-      </link>
-    </children>
->>>>>>> master
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver1Line"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver2Line"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver3Line"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true" active="true">
-<<<<<<< HEAD
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="175" height="45" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="i%2 = 0">
-=======
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="225" height="95" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="i%2 = 0">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="conditionSelText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="0"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@loopStatement/@refinement/@guards.0"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-<<<<<<< HEAD
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="175" height="45" x="175" y="190" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
-=======
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="225" height="95" x="225" y="290" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementSelNameText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@loopStatement/@refinement/@commands.1"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor" outgoingConnections="//@connections.0"/>
-    </children>
-    <children visible="true">
-<<<<<<< HEAD
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="175" height="45" x="175" y="125" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(\nothing);((z * pow(b,i) = pow(a,n)) &amp; (i != 0)) &amp; (i%2 = 1)}">
-=======
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="225" height="62" x="225" y="206" horizontalAlignment="ALIGNMENT_CENTER" value="{((z * pow(b,i) = pow(a,n)) &amp; (i != 0)) &amp; (i%2 = 1)}">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@loopStatement/@refinement/@commands.1/@preCondition"/>
-      </link>
-    </children>
-<<<<<<< HEAD
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(i,z);&#xD;&#xA;z * pow(b,i) = pow(a,n)}">
-=======
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="450" height="31" y="175" horizontalAlignment="ALIGNMENT_CENTER" value="">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preConditionModifiables"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@loopStatement/@refinement/@commands.1/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" horizontalAlignment="ALIGNMENT_CENTER" value="{z * pow(b,i) = pow(a,n)}">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@loopStatement/@refinement/@commands.1/@postCondition"/>
-      </link>
-    </children>
-<<<<<<< HEAD
-=======
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="450" height="31" y="405" horizontalAlignment="ALIGNMENT_CENTER" value="">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postConditionModifiables"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@loopStatement/@refinement/@commands.1/@postCondition"/>
-      </link>
-    </children>
->>>>>>> master
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver1Line"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-<<<<<<< HEAD
-        <points x="175" y="60"/>
-        <points x="175" y="105"/>
-=======
-        <points x="225" y="60"/>
-        <points x="225" y="155"/>
->>>>>>> master
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver2Line"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-<<<<<<< HEAD
-        <points x="175" y="125"/>
-        <points x="175" y="170"/>
-=======
-        <points x="225" y="206"/>
-        <points x="225" y="270"/>
->>>>>>> master
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="ver3Line"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-<<<<<<< HEAD
-        <points x="175" y="190"/>
-        <points x="175" y="235"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="175" height="45" x="175" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="i%2 = 1">
-=======
-        <points x="225" y="290"/>
-        <points x="225" y="385"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="225" height="95" x="225" y="60" horizontalAlignment="ALIGNMENT_CENTER" value="i%2 = 1">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="conditionSelText"/>
-        <properties key="org.eclipse.graphiti.pattern.id.index" value="1"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@loopStatement/@refinement/@guards.1"/>
-      </link>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-<<<<<<< HEAD
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="360" height="160" x="250" y="1171" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="Exponentation.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@loopStatement/@refinement/@commands.0/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.1"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="120" height="120" x="120" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="i = i/2; b = b*b;">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@loopStatement/@refinement/@commands.0/@refinement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="120" height="120" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(\nothing);((z * pow(b,i) = pow(a,n)) &amp; (i != 0)) &amp; (i%2 = 0)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@loopStatement/@refinement/@commands.0/@refinement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="120" height="120" x="240" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(b,i); &#xD;&#xA;z * pow(b,i) = pow(a,n)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@loopStatement/@refinement/@commands.0/@refinement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="340" y="10" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@loopStatement/@refinement/@commands.0/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="120" height="20" x="120" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="120" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="120" height="20" x="240" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerSeparater"/>
-        <points y="40"/>
-        <points x="360" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preSep"/>
-        <points x="240"/>
-        <points x="240" y="160"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postSep"/>
-        <points x="120"/>
-        <points x="120" y="160"/>
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="400" height="160" x="620" y="1171" cornerHeight="20" cornerWidth="20">
-=======
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="350" height="150" x="500" y="1520" cornerHeight="20" cornerWidth="20">
->>>>>>> master
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="Exponentation.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@loopStatement/@refinement/@commands.1/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.0"/>
-    <children visible="true" active="true">
-<<<<<<< HEAD
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="133" height="120" x="133" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="i = i-1; z = z*b;">
-=======
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="116" height="110" x="116" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="i = i-1; z = z*b;">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@loopStatement/@refinement/@commands.1/@refinement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-<<<<<<< HEAD
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="133" height="120" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(\nothing);((z * pow(b,i) = pow(a,n)) &amp; (i != 0)) &amp; (i%2 = 1)}">
-=======
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="116" height="72" y="76" horizontalAlignment="ALIGNMENT_CENTER" value="{((z * pow(b,i) = pow(a,n)) &amp; (i != 0)) &amp; (i%2 = 1)}">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@loopStatement/@refinement/@commands.1/@refinement/@preCondition"/>
-      </link>
-    </children>
-<<<<<<< HEAD
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="133" height="120" x="266" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="{modifiable(b,i,z);&#xD;&#xA;z * pow(b,i) = pow(a,n)}">
-=======
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="116" height="36" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable(b, i, z);">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preConditionModifiables"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@loopStatement/@refinement/@commands.1/@refinement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="116" height="72" x="232" y="76" horizontalAlignment="ALIGNMENT_CENTER" value="{z * pow(b,i) = pow(a,n)}">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@loopStatement/@refinement/@commands.1/@refinement/@postCondition"/>
-      </link>
-    </children>
-<<<<<<< HEAD
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="380" y="10" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-=======
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="116" height="36" x="232" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable(b, i, z);">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postConditionModifiables"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@loopStatement/@refinement/@commands.1/@refinement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="330" y="10" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@loopStatement/@refinement/@commands.1/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-<<<<<<< HEAD
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="133" height="20" x="133" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="statement">
-=======
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="116" height="20" x="116" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Statement">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-<<<<<<< HEAD
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="133" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-=======
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="116" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-<<<<<<< HEAD
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="133" height="20" x="266" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-=======
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="116" height="20" x="232" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
->>>>>>> master
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerSeparater"/>
-        <points y="40"/>
-<<<<<<< HEAD
-        <points x="400" y="40"/>
-=======
-        <points x="350" y="40"/>
->>>>>>> master
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preSep"/>
-<<<<<<< HEAD
-        <points x="266"/>
-        <points x="266" y="160"/>
-=======
-        <points x="232"/>
-        <points x="232" y="150"/>
->>>>>>> master
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postSep"/>
-<<<<<<< HEAD
-        <points x="133"/>
-        <points x="133" y="160"/>
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.7/@children.21/@anchors.0" end="//@children.9/@anchors.0">
-=======
-        <points x="116"/>
-        <points x="116" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-        <points y="76"/>
-        <points x="116" y="76"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor2Line"/>
-        <points x="232" y="76"/>
-        <points x="350" y="76"/>
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <children xsi:type="pi:ContainerShape" visible="true" active="true">
-    <properties key="org.eclipse.graphiti.pattern.patternType" value="org.eclipse.graphiti.pattern.idpattern"/>
-    <graphicsAlgorithm xsi:type="al:RoundedRectangle" foreground="//@colors.2" lineWidth="2" filled="true" transparency="0.0" width="350" height="150" x="120" y="1520" cornerHeight="20" cornerWidth="20">
-      <properties key="org.eclipse.graphiti.pattern.id.id" value="mainRectangle"/>
-      <renderingStyle>
-        <adaptedGradientColoredAreas definedStyleId="blue-white" gradientType="0">
-          <adaptedGradientColoredAreas styleAdaption="0">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="212" green="231" blue="248"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="250" green="251" blue="252"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="1">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="129" green="185" blue="234"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="170" green="208" blue="242"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-          <adaptedGradientColoredAreas styleAdaption="2">
-            <gradientColor>
-              <start locationType="LOCATION_TYPE_ABSOLUTE_START" locationValue="0">
-                <color red="187" green="218" blue="247"/>
-              </start>
-              <end locationType="LOCATION_TYPE_ABSOLUTE_END" locationValue="0">
-                <color red="197" green="224" blue="247"/>
-              </end>
-            </gradientColor>
-          </adaptedGradientColoredAreas>
-        </adaptedGradientColoredAreas>
-      </renderingStyle>
-    </graphicsAlgorithm>
-    <link>
-      <businessObjects href="Exponentation.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@loopStatement/@refinement/@commands.0/@refinement"/>
-    </link>
-    <anchors xsi:type="pi:ChopboxAnchor" incomingConnections="//@connections.1"/>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="116" height="110" x="116" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="i = i/2; b = b*b;">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@loopStatement/@refinement/@commands.0/@refinement"/>
-      </link>
-      <anchors xsi:type="pi:ChopboxAnchor"/>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="116" height="72" y="76" horizontalAlignment="ALIGNMENT_CENTER" value="{((z * pow(b,i) = pow(a,n)) &amp; (i != 0)) &amp; (i%2 = 0)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@loopStatement/@refinement/@commands.0/@refinement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="116" height="36" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable(b, i, z);">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preConditionModifiables"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@loopStatement/@refinement/@commands.0/@refinement/@preCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="116" height="72" x="232" y="76" horizontalAlignment="ALIGNMENT_CENTER" value="{z * pow(b,i) = pow(a,n)}">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postText"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@loopStatement/@refinement/@commands.0/@refinement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true" active="true">
-      <graphicsAlgorithm xsi:type="al:MultiText" lineWidth="1" filled="false" transparency="0.0" width="116" height="36" x="232" y="40" horizontalAlignment="ALIGNMENT_CENTER" value="modifiable(b, i, z);">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postConditionModifiables"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@loopStatement/@refinement/@commands.0/@refinement/@postCondition"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Image" lineWidth="1" transparency="0.0" width="10" height="10" x="330" y="10" id="de.tu_bs.cs.isf.cbc.tool.proven" stretchH="false" stretchV="false" proportional="false">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="imageproven"/>
-      </graphicsAlgorithm>
-      <link>
-        <businessObjects href="Exponentation.cbcmodel#/0/@statement/@refinement/@secondStatement/@refinement/@loopStatement/@refinement/@commands.0/@refinement"/>
-      </link>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="116" height="20" x="116" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="Statement">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="statementHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="116" height="20" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="precondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Text" lineWidth="1" filled="false" transparency="0.0" width="116" height="20" x="232" y="20" font="//@fonts.0" horizontalAlignment="ALIGNMENT_CENTER" value="postcondition">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postHeader"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="headerSeparater"/>
-        <points y="40"/>
-        <points x="350" y="40"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="preSep"/>
-        <points x="232"/>
-        <points x="232" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="postSep"/>
-        <points x="116"/>
-        <points x="116" y="150"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor1Line"/>
-        <points y="76"/>
-        <points x="116" y="76"/>
-      </graphicsAlgorithm>
-    </children>
-    <children visible="true">
-      <graphicsAlgorithm xsi:type="al:Polyline" lineWidth="1" filled="false" transparency="0.0">
-        <properties key="org.eclipse.graphiti.pattern.id.id" value="hor2Line"/>
-        <points x="232" y="76"/>
-        <points x="350" y="76"/>
-      </graphicsAlgorithm>
-    </children>
-  </children>
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.7/@children.25/@anchors.0" end="//@children.8/@anchors.0">
->>>>>>> master
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-<<<<<<< HEAD
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.7/@children.14/@anchors.0" end="//@children.8/@anchors.0">
-=======
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.7/@children.16/@anchors.0" end="//@children.9/@anchors.0">
->>>>>>> master
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.6/@children.0/@anchors.0" end="//@children.7/@anchors.0">
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.4/@children.0/@anchors.0" end="//@children.5/@anchors.0">
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-<<<<<<< HEAD
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.4/@children.2/@anchors.0" end="//@children.6/@anchors.0">
-=======
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.4/@children.3/@anchors.0" end="//@children.6/@anchors.0">
->>>>>>> master
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-<<<<<<< HEAD
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@children.1/@anchors.0" end="//@children.4/@anchors.0">
-=======
-  <connections xsi:type="pi:FreeFormConnection" visible="true" active="true" start="//@children.0/@children.2/@anchors.0" end="//@children.4/@anchors.0">
->>>>>>> master
-    <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED"/>
-    <connectionDecorators visible="true" locationRelative="true" location="1.0">
-      <graphicsAlgorithm xsi:type="al:Polyline" foreground="//@colors.4" lineStyle="UNSPECIFIED">
-        <points x="-15" y="10"/>
-        <points/>
-        <points x="-15" y="-10"/>
-      </graphicsAlgorithm>
-    </connectionDecorators>
-  </connections>
-  <colors red="227" green="238" blue="249"/>
-  <colors red="255" green="255" blue="255"/>
-  <colors green="127"/>
-  <colors red="255"/>
-  <colors/>
-  <fonts name="Arial" size="9" bold="true"/>
-</pi:Diagram>
diff --git a/de.tu_bs.cs.isf.cbc.statistics.ui/.classpath.orig b/de.tu_bs.cs.isf.cbc.statistics.ui/.classpath.orig
deleted file mode 100644
index b6a603a61..000000000
--- a/de.tu_bs.cs.isf.cbc.statistics.ui/.classpath.orig
+++ /dev/null
@@ -1,42 +0,0 @@
-<<<<<<< HEAD
-<<<<<<<< HEAD:de.tu_bs.cs.isf.cbc.statistics.ui/.classpath
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-=======
-<<<<<<<< HEAD:BankAccountOO/.classpath
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
-========
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
-		<attributes>
-			<attribute name="module" value="true"/>
-		</attributes>
-	</classpathentry>
->>>>>>> master
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
-<<<<<<< HEAD
-========
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-16">
-		<attributes>
-			<attribute name="module" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
->>>>>>>> master:IntegerListOO/.classpath
-=======
->>>>>>>> master:de.tu_bs.cs.isf.cbc.statistics.ui/.classpath
->>>>>>> master
diff --git a/de.tu_bs.cs.isf.cbc.statistics.ui/META-INF/MANIFEST.MF.orig b/de.tu_bs.cs.isf.cbc.statistics.ui/META-INF/MANIFEST.MF.orig
deleted file mode 100644
index 4fabaa661..000000000
--- a/de.tu_bs.cs.isf.cbc.statistics.ui/META-INF/MANIFEST.MF.orig
+++ /dev/null
@@ -1,28 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Ui
-Bundle-SymbolicName: de.tu_bs.cs.isf.cbc.statistics.ui;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Automatic-Module-Name: de.tu.bs.cs.isf.cbc.statistics.ui
-Bundle-RequiredExecutionEnvironment: JavaSE-11
-<<<<<<< HEAD
-Require-Bundle: org.eclipse.jface,
- org.eclipse.swt,
- de.tu_bs.cs.isf.cbc.statistics,
-=======
-Require-Bundle: de.tu_bs.cs.isf.cbc.statistics,
->>>>>>> master
- org.eclipse.ui,
- org.eclipse.core.resources,
- org.eclipse.jdt.core,
- org.eclipse.core.runtime,
- de.tu-bs.cs.isf.cbc.util,
- de.tu-bs.cs.isf.cbc.model,
-<<<<<<< HEAD
- org.eclipse.ui.workbench,
- org.eclipse.ui.ide,
- de.tu-bs.cs.isf.cbc.tool
-=======
- org.eclipse.ui.ide
-Import-Package: de.tu_bs.cs.isf.cbc.exceptions
->>>>>>> master
diff --git a/de.tu_bs.cs.isf.cbc.statistics.ui/src/de/tu_bs/cs/isf/cbc/statistics/ui/HtmlHandler.java.orig b/de.tu_bs.cs.isf.cbc.statistics.ui/src/de/tu_bs/cs/isf/cbc/statistics/ui/HtmlHandler.java.orig
deleted file mode 100644
index f4130ade5..000000000
--- a/de.tu_bs.cs.isf.cbc.statistics.ui/src/de/tu_bs/cs/isf/cbc/statistics/ui/HtmlHandler.java.orig
+++ /dev/null
@@ -1,342 +0,0 @@
-package de.tu_bs.cs.isf.cbc.statistics.ui;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.net.URL;
-<<<<<<< HEAD
-=======
-import java.util.ArrayList;
-import java.util.HashMap;
->>>>>>> master
-import java.util.LinkedList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Platform;
-
-<<<<<<< HEAD
-import de.tu_bs.cs.isf.cbc.statistics.RHelper;
-import de.tu_bs.cs.isf.cbc.statistics.StatisticsEntry;
-=======
-import de.tu_bs.cs.isf.cbc.statistics.DiagramType;
-import de.tu_bs.cs.isf.cbc.statistics.StatisticsEntry;
-import de.tu_bs.cs.isf.cbc.util.Features;
-import de.tu_bs.cs.isf.cbc.util.statistics.RHelper;
->>>>>>> master
-
-public class HtmlHandler {
-
-	// String with placeholder
-//	private String beforeEntrys = "";
-//	private String betweenEntrysAndDiagrams = ""; 
-//	private String afterDiagrams = ""; 
-	private int numberOfDiagrams;
-<<<<<<< HEAD
-	private List<StatisticsEntry> entries = new LinkedList<StatisticsEntry>();
-=======
-	private List<StatisticsEntry> entries = new ArrayList<StatisticsEntry>();
-	private HashMap<StatisticsEntry, String> configEntries = new HashMap<StatisticsEntry, String>();
-	private List<String> configs = new ArrayList<String>();
->>>>>>> master
-	private List<IFile> selectedDiagramFiles = new LinkedList<IFile>();
-
-	private String placeholderPlainStatistics = "";
-	private String placeholderGeneratedDiagram = "";
-	private String lineBreak = "<br />";
-<<<<<<< HEAD
-=======
-	private boolean configView;
-	private Features features;
->>>>>>> master
-
-	public void setDiagramPaths(List<?> paths) {
-
-	}
-
-	public void setData(int numberOfDiagrams, List<StatisticsEntry> entries, List<IFile> selectedDiagramFiles) {
-
-		this.numberOfDiagrams = numberOfDiagrams;
-		this.entries = entries;
-		this.selectedDiagramFiles = selectedDiagramFiles;
-
-	}
-<<<<<<< HEAD
-
-=======
-	
-	public void setDataSPL(int numberOfDiagrams, final HashMap<StatisticsEntry, String> configEntries, final List<String> configs, final List<IFile> selectedDiagramFiles, final Features features) {
-		this.numberOfDiagrams = numberOfDiagrams;
-		this.configEntries = configEntries;
-		this.configs = configs;
-		this.selectedDiagramFiles = selectedDiagramFiles;
-		this.features = features;
-	}
-	
-	private String generateDiagrams(final List<StatisticsEntry> entries, boolean isSpl) {
-		String diagStr = "";
-		if (entries == null || entries.isEmpty()) {
-			return "";
-		}
-
-		RHelper helper;
-		if (isSpl) {
-			helper = new RHelper(configEntries, features);
-			helper.setConfigView(this.configView);
-		} else {
-			helper = new RHelper();
-		}
-		
-		for (int i = 0; i < 2; i++) {
-			String pathToPNG;
-			String pathToPDF;
-			if (i == 0) {
-				pathToPNG = helper.generatePNG("statistics" + i + "-png", entries, DiagramType.AUTOMODE);
-				pathToPDF = helper.generatePDF("statistics" + i + "-pdf", entries, DiagramType.AUTOMODE);
-			} else {
-				pathToPNG = helper.generatePNG("statistics" + i + "-png", entries, DiagramType.PROOF_STEPS);
-				pathToPDF = helper.generatePDF("statistics" + i + "-pdf", entries, DiagramType.PROOF_STEPS);
-			}
-
-			if(pathToPDF != null) {
-				//diagStr += "<a class=\"text\" href=\" "+ pathToPDF + "\">Open as PDF</a>\r\n<br>\r\n";
-			}
-			
-			if(pathToPNG != null) {
-				diagStr += "<img class=\"\" src=\"" + pathToPNG + "\">\r\n";
-			}
-			else {
-				URL errorImageURI = Platform.getBundle("de.tu_bs.cs.isf.cbc.statistics.ui").getEntry("icons/how-to-environment-R.png");
-				try {
-					pathToPNG = new File(FileLocator.resolve(errorImageURI).toURI()).getAbsolutePath();
-				} catch (URISyntaxException | IOException e1) {
-					e1.printStackTrace();
-				}
-
-				diagStr += "<p>Cannot generate diagrams, probably because R is not installed.<br><strong>Please install R</strong> and add it to your operating system's environment path:</p>";
-				diagStr += "<img class=\"\" src=\"" + pathToPNG + "\">\r\n";
-			}
-		}
-		return diagStr;
-	}
-
-	public String getHtmlStringSPL() {
-		boolean generatedDiagram = false;
-		String diagramName = "";
-		List<StatisticsEntry> entriesPerDiagram = new LinkedList<StatisticsEntry>();
-
-		if (configEntries == null || configEntries.isEmpty()) {
-			return null;
-		}
-		diagramName = configEntries.keySet().stream().findFirst().get().getMapping().getCorcDiagramName();
-		final var configNames = configEntries.values().stream().distinct().sorted().toList();
-		for (String config : configNames) {
-			createConfigName(config);
-			this.entries.clear();
-			for (var entry : configEntries.keySet()) {
-				if (!configEntries.get(entry).equals(config)) {
-					continue;
-				}
-				this.entries.add(entry);
-			}
-			if (numberOfDiagrams == 1) {
-				entriesPerDiagram = entries;
-				placeholderPlainStatistics = placeholderPlainStatistics + "<h3 class\"text\">Diagram: " + diagramName + "</h3>";
-				createPlaceholderPlainStringForOneDiagram(diagramName, entriesPerDiagram);
-				placeholderGeneratedDiagram = "<div class=\"text block\">\r\n"
-						+ "                <p>No diagrams generated. For diagram generation, please select more than one CorC diagram</p>\r\n" + "            </div>";
-			} else if (numberOfDiagrams > 1) {
-				
-				for (IFile file : selectedDiagramFiles) {
-					diagramName = file.getName().substring(0, file.getName().indexOf(".diagram"));
-					for (StatisticsEntry entry : entries) {
-						if (entry.getMapping().getCorcDiagramName().equals(diagramName)) {
-							entriesPerDiagram.add(entry);
-						}
-					}
-					placeholderPlainStatistics = placeholderPlainStatistics + "<h3 class\"text\">Diagram: " + diagramName + "</h3>";
-					createPlaceholderPlainStringForOneDiagram(diagramName, entriesPerDiagram);
-					entriesPerDiagram = new LinkedList<StatisticsEntry>();
-				}
-				if (generatedDiagram) {
-					continue;
-				}
-				generatedDiagram = true;
-				placeholderGeneratedDiagram += generateDiagrams(entries, true);
-			}
-		}
-	
-//		TODO: abfangen keine entries
-
-		String htmlStyleTag = "<style>\r\n" + "        body{\r\n" + "            margin: 0;\r\n"
-				+ "            padding: 0;\r\n" + "        }\r\n" + "        .container{\r\n" + "        }\r\n"
-				+ "        .text{\r\n" + "            font-family: sans-serif;\r\n" + "        }\r\n"
-				+ "        .block{\r\n" + "            margin-left: 25px;\r\n" + "            margin-bottom: 45px;\r\n"
-				+ "        }\r\n" + "        .horizontal-line{\r\n" + "            height: 5px;\r\n"
-				+ "            background-color: #f3f3f3;\r\n" + "            border: none;\r\n" + "        }\r\n"
-				+ "        .inner-box{\r\n" + "            padding: 10px;\r\n" + "        }\r\n"
-				+ "        .left-margin-class{\r\n" + "            margin-left: 20px;\r\n" + "        }\r\n"
-				+ "    </style>";
-
-		return "<!DOCTYPE html>\r\n" + "<html lang=\"en\">\r\n" + "<head>\r\n" + "    <meta charset=\"UTF-8\">\r\n"
-				+ "    <title>WebCorCStatistics Viewer</title>\r\n" + "\r\n" + htmlStyleTag + "</head>\r\n"
-				+ "<body>\r\n" + "    <div class=\"container\">\r\n" + "        <div class=\"inner-box\">\r\n"
-				+ "            <h1 class=\"text\" style=\"color:DarkGreen\">Plain Statistics</h1>\r\n"
-				+ "            <div class=\"text block\">\r\n" + "                <p>" + placeholderPlainStatistics
-				+ "</p>\r\n" + "            </div>\r\n" + "        </div>\r\n"
-				+ "        <hr class=\"horizontal-line\">\r\n" + "        <div class=\"inner-box\">\r\n"
-				+ "            <h1 class=\"text\" style=\"color:DarkGreen\">Generated Diagram</h1>\r\n"
-//				+ "            <img class=\"\" src=\"file:///D:/Uni/Bachelorarbeit/HTMLTemplateCode/test.png\">\r\n"
-				+ placeholderGeneratedDiagram + "        </div>\r\n" + "    </div>\r\n" + "</body>\r\n" + "</html>";
-	}
-	
->>>>>>> master
-	public String getHtmlString() {
-		String diagramName = "";
-		List<StatisticsEntry> entriesPerDiagram = new LinkedList<StatisticsEntry>();
-
-		if (entries == null || entries.isEmpty()) {
-			
-		}
-		else {
-			
-			if (numberOfDiagrams == 1) {
-				entriesPerDiagram = entries;
-				diagramName = entries.get(0).getMapping().getCorcDiagramName();
-<<<<<<< HEAD
-=======
-				placeholderPlainStatistics = placeholderPlainStatistics + "<h3 class\"text\">Diagram: " + diagramName + "</h3>";
->>>>>>> master
-				createPlaceholderPlainStringForOneDiagram(diagramName, entriesPerDiagram);
-				
-				placeholderGeneratedDiagram = "<div class=\"text block\">\r\n"
-						+ "                <p>No diagrams generated. For diagram generation, please select more than one CorC diagram</p>\r\n" + "            </div>";
-			} else if (numberOfDiagrams > 1) {
-				
-				for (IFile file : selectedDiagramFiles) {
-					diagramName = file.getName().substring(0, file.getName().indexOf(".diagram"));
-					for (StatisticsEntry entry : entries) {
-						if (entry.getMapping().getCorcDiagramName().equals(diagramName)) {
-							entriesPerDiagram.add(entry);
-						}
-					}
-<<<<<<< HEAD
-					createPlaceholderPlainStringForOneDiagram(diagramName, entriesPerDiagram);
-					entriesPerDiagram = new LinkedList<StatisticsEntry>();
-				}
-				
-				RHelper helper = new RHelper();
-				String pathToPNG = helper.generatePNG("statistics-png", entries);
-				String pathToPDF = helper.generatePDF("statistics-pdf", entries);
-				
-//				helper.setStatisticsFileStringForDiagrams(entries);
-//				List<String> diagramPaths = new LinkedList<String>();
-				if(pathToPDF != null) {
-					placeholderGeneratedDiagram += "<a class=\"text\" href=\" "+ pathToPDF + "\">Open as PDF</a>\r\n<br>\r\n";
-				}
-				
-				if(pathToPNG != null) {
-					placeholderGeneratedDiagram += "<img class=\"\" src=\"" + pathToPNG + "\">\r\n";
-				}
-				else {
-					URL errorImageURI = Platform.getBundle("de.tu_bs.cs.isf.cbc.statistics.ui").getEntry("icons/how-to-environment-R.png");
-					try {
-						pathToPNG = new File(FileLocator.resolve(errorImageURI).toURI()).getAbsolutePath();
-					} catch (URISyntaxException | IOException e1) {
-						e1.printStackTrace();
-					}
-
-					placeholderGeneratedDiagram += "<p>Cannot generate diagrams, probably because R is not installed.<br><strong>Please install R</strong> and add it to your operating system's environment path:</p>";
-					placeholderGeneratedDiagram += "<img class=\"\" src=\"" + pathToPNG + "\">\r\n";
-				}
-=======
-					placeholderPlainStatistics = placeholderPlainStatistics + "<h3 class\"text\">Diagram: " + diagramName + "</h3>";
-					createPlaceholderPlainStringForOneDiagram(diagramName, entriesPerDiagram);
-					entriesPerDiagram = new LinkedList<StatisticsEntry>();
-				}
-				placeholderGeneratedDiagram += generateDiagrams(entries, false);
->>>>>>> master
-			}
-		}
-//		TODO: abfangen keine entries
-
-		String htmlStyleTag = "<style>\r\n" + "        body{\r\n" + "            margin: 0;\r\n"
-				+ "            padding: 0;\r\n" + "        }\r\n" + "        .container{\r\n" + "        }\r\n"
-				+ "        .text{\r\n" + "            font-family: sans-serif;\r\n" + "        }\r\n"
-				+ "        .block{\r\n" + "            margin-left: 25px;\r\n" + "            margin-bottom: 45px;\r\n"
-				+ "        }\r\n" + "        .horizontal-line{\r\n" + "            height: 5px;\r\n"
-				+ "            background-color: #f3f3f3;\r\n" + "            border: none;\r\n" + "        }\r\n"
-				+ "        .inner-box{\r\n" + "            padding: 10px;\r\n" + "        }\r\n"
-				+ "        .left-margin-class{\r\n" + "            margin-left: 20px;\r\n" + "        }\r\n"
-				+ "    </style>";
-
-		return "<!DOCTYPE html>\r\n" + "<html lang=\"en\">\r\n" + "<head>\r\n" + "    <meta charset=\"UTF-8\">\r\n"
-				+ "    <title>WebCorCStatistics Viewer</title>\r\n" + "\r\n" + htmlStyleTag + "</head>\r\n"
-				+ "<body>\r\n" + "    <div class=\"container\">\r\n" + "        <div class=\"inner-box\">\r\n"
-				+ "            <h2 class=\"text\">Plain Statistics</h2>\r\n"
-				+ "            <div class=\"text block\">\r\n" + "                <p>" + placeholderPlainStatistics
-				+ "</p>\r\n" + "            </div>\r\n" + "        </div>\r\n"
-				+ "        <hr class=\"horizontal-line\">\r\n" + "        <div class=\"inner-box\">\r\n"
-				+ "            <h2 class=\"text\">Generated Diagram</h2>\r\n"
-//				+ "            <img class=\"\" src=\"file:///D:/Uni/Bachelorarbeit/HTMLTemplateCode/test.png\">\r\n"
-				+ placeholderGeneratedDiagram + "        </div>\r\n" + "    </div>\r\n" + "</body>\r\n" + "</html>";
-	}
-<<<<<<< HEAD
-=======
-	
-	private void createConfigName(String config) {
-		/*for (int i = 0; i < config.length()-1; i++) {
-			if (Character.isLowerCase(config.charAt(i)) && Character.isUpperCase(config.charAt(i+1))) {
-				config = config.substring(0, i+1) + ", " + config.substring(i+1, config.length());
-			}
-		}
-		config = "[" + config + "]"; */
-		placeholderPlainStatistics = placeholderPlainStatistics + "<h2 class\"text\" style=\"color:rgb(10,10,200);\">Configuration: " + config + "</h2>";
-	}
->>>>>>> master
-
-	private void createPlaceholderPlainStringForOneDiagram(String diagramName,
-			List<StatisticsEntry> entriesPerDiagram) {
-
-<<<<<<< HEAD
-		placeholderPlainStatistics = placeholderPlainStatistics + "<h3 class\"text\">Diagram: " + diagramName + "</h3>";
-=======
-		//placeholderPlainStatistics = placeholderPlainStatistics + "<h3 class\"text\">Diagram: " + diagramName + "</h3>";
->>>>>>> master
-
-		if (entriesPerDiagram.isEmpty()) {
-			placeholderPlainStatistics = placeholderPlainStatistics
-					+ "<p class= \"left-margin-class\">No data found. Please generate statistics by verifying statements.</p>";
-		} else {
-			float totalAutomodeTime = 0;
-			// TODO: sort entriesPerDiagram: alphabetic names 
-			for (StatisticsEntry entry : entriesPerDiagram) {
-
-				String KeYFile = entry.getMapping().getKeyFilePath();
-				KeYFile = KeYFile.substring(KeYFile.lastIndexOf(File.separator) + 1, KeYFile.length());
-				
-				placeholderPlainStatistics = placeholderPlainStatistics + "<div class=\"left-margin-class\">"
-						+ "<h4 class=\"text\">KeY file: " + KeYFile + "</h4>" + "<p class= \"left-margin-class\">"
-						+ "Automode Time: " + entry.getData().getAutoModeTimeInMillis() + "ms" + lineBreak
-						+ "Number of Branches: " + entry.getData().getNumberOfBranches() + lineBreak
-						+ "Number of Nodes: " + entry.getData().getNumberOfNodes() + lineBreak
-						+ "total Rule Applications: " + entry.getData().getTotalRuleApps() + lineBreak
-						+ "Time per Step: " + entry.getData().getTimePerStepInMillis() + "ms" + lineBreak + "Time: "
-						+ entry.getData().getTimeInMillis() + "ms" + lineBreak
-						+ "Successfully proven: " + entry.getData().isIsProven() + "</p>" + "</div>";
-				totalAutomodeTime = totalAutomodeTime + entry.getData().getAutoModeTimeInMillis();
-			}
-			placeholderPlainStatistics = placeholderPlainStatistics + "Total automode time needed: " + totalAutomodeTime + "ms" 
-			+ lineBreak			+ lineBreak			+ lineBreak;
-		}
-	}
-
-<<<<<<< HEAD
-=======
-	public void setConfigView(boolean configView) {
-		this.configView = configView;
-	}
-
->>>>>>> master
-}
diff --git a/de.tu_bs.cs.isf.cbc.statistics.ui/src/de/tu_bs/cs/isf/cbc/statistics/ui/OpenInDiagramHandler.java.orig b/de.tu_bs.cs.isf.cbc.statistics.ui/src/de/tu_bs/cs/isf/cbc/statistics/ui/OpenInDiagramHandler.java.orig
deleted file mode 100644
index a22cb967b..000000000
--- a/de.tu_bs.cs.isf.cbc.statistics.ui/src/de/tu_bs/cs/isf/cbc/statistics/ui/OpenInDiagramHandler.java.orig
+++ /dev/null
@@ -1,91 +0,0 @@
-package de.tu_bs.cs.isf.cbc.statistics.ui;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IEditorDescriptor;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.handlers.HandlerUtil;
-import org.eclipse.ui.part.FileEditorInput;
-
-import de.tu_bs.cs.isf.cbc.statistics.StatisticsDatabase;
-import de.tu_bs.cs.isf.cbc.statistics.StatisticsEntry;
-<<<<<<< HEAD
-import de.tu_bs.cs.isf.cbc.tool.helper.HighlightHelper;
-=======
->>>>>>> master
-
-public class OpenInDiagramHandler extends AbstractHandler {
-
-	// TODO: get the name of a diagram and find already executed proofs related to it
-	// TODO: if a package or folder or something is clicked -> collect statistics for multiple diagrams
-	@Override
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		ISelection selection = HandlerUtil.getActiveWorkbenchWindow(event).getActivePage().getSelection();
-		List<IResource> resourceList = new LinkedList<>();
-		
-		if (selection != null & selection instanceof IStructuredSelection) {
-			IStructuredSelection strucSelection = (IStructuredSelection) selection;
-			for(Object selectedElement : strucSelection.toList()) {
-				if(selectedElement instanceof IJavaElement) {
-					IResource res = ((IJavaElement) selectedElement).getResource();
-					resourceList.add(res);
-				}
-				else if(selectedElement instanceof IResource) {
-					resourceList.add((IResource) selectedElement);
-				}
-			}
-		}
-		
-		IFile file = (IFile)resourceList.get(0);
-		
-		StatisticsEntry dbEntry = StatisticsDatabase.instance.getLastEntrysRelatedToKeyFile(file);
-
-		if (dbEntry == null)
-			de.tu_bs.cs.isf.cbc.util.Console.println("Error: Could not find a matching statement.");
-		
-		Path path = new Path(dbEntry.getMapping().getCorcDiagramPath());
-		IFile diagramFile = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
-		
-		showInEditor(diagramFile);
-<<<<<<< HEAD
-		HighlightHelper.instance.registerElementToHighlight(dbEntry.getMapping().getCorcElementId());
-=======
-		//HighlightHelper.instance.registerElementToHighlight(dbEntry.getMapping().getCorcElementId()); TODO: Move this feature to *.tool package
->>>>>>> master
-		
-		return null;
-	}
-	
-	private boolean showInEditor(IFile file) {
-		IWorkbench workbench = PlatformUI.getWorkbench();
-		if (file == null || workbench.getActiveWorkbenchWindow() == null)
-			return false;
-
-		IWorkbenchPage page = workbench.getActiveWorkbenchWindow().getActivePage();
-		if (page == null)
-			return false;
-
-		IEditorDescriptor desc = PlatformUI.getWorkbench().getEditorRegistry().getDefaultEditor(file.getName());
-		try {
-			page.openEditor(new FileEditorInput(file), desc.getId());
-		} catch (PartInitException e) {
-			e.printStackTrace();
-			return false;
-		}
-		return true;
-	}
-}
diff --git a/de.tu_bs.cs.isf.cbc.statistics.ui/src/de/tu_bs/cs/isf/cbc/statistics/ui/OpenStatisticsViewHandler.java.orig b/de.tu_bs.cs.isf.cbc.statistics.ui/src/de/tu_bs/cs/isf/cbc/statistics/ui/OpenStatisticsViewHandler.java.orig
deleted file mode 100644
index 8ccbd10b3..000000000
--- a/de.tu_bs.cs.isf.cbc.statistics.ui/src/de/tu_bs/cs/isf/cbc/statistics/ui/OpenStatisticsViewHandler.java.orig
+++ /dev/null
@@ -1,199 +0,0 @@
-package de.tu_bs.cs.isf.cbc.statistics.ui;
-
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Optional;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-<<<<<<< HEAD
-=======
-import org.eclipse.core.internal.resources.Resource;
-import org.eclipse.core.resources.IContainer;
->>>>>>> master
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-<<<<<<< HEAD
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.handlers.HandlerUtil;
-
-public class OpenStatisticsViewHandler extends AbstractHandler {
-
-=======
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.handlers.HandlerUtil;
-import de.tu_bs.cs.isf.cbc.exceptions.FeatureCallerException;
-import de.tu_bs.cs.isf.cbc.util.Console;
-import de.tu_bs.cs.isf.cbc.util.Features;
-import de.tu_bs.cs.isf.cbc.util.FileHandler;
-import de.tu_bs.cs.isf.cbc.util.FileUtil;
-
-public class OpenStatisticsViewHandler extends AbstractHandler {
-
-	public static final Color blue = new Color(new RGB(10, 10, 200));
->>>>>>> master
-	// TODO: get the name of a diagram and find already executed proofs related to it
-	// TODO: if a package or folder or something is clicked -> collect statistics for multiple diagrams
-	@Override
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-<<<<<<< HEAD
-=======
-		long start = System.nanoTime();
-		Console.clear();
-		Console.println("Start generating statistics...\n");
->>>>>>> master
-		ISelection selection = HandlerUtil.getActiveWorkbenchWindow(event).getActivePage().getSelection();
-		List<IResource> resourceList = new LinkedList<>();
-		
-		if (selection != null & selection instanceof IStructuredSelection) {
-			IStructuredSelection strucSelection = (IStructuredSelection) selection;
-			for(Object selectedElement : strucSelection.toList()) {
-				if(selectedElement instanceof IJavaElement) {
-					IResource res = ((IJavaElement) selectedElement).getResource();
-					resourceList.add(res);
-				}
-				else if(selectedElement instanceof IResource) {
-					resourceList.add((IResource) selectedElement);
-				}
-			}
-		}
-		if(resourceList.isEmpty()) {
-<<<<<<< HEAD
-=======
-			Console.println("Nothing to generate.");
->>>>>>> master
-			return null;
-		}
-		
-		List<IFile> allDiagramFiles = new LinkedList<>();
-<<<<<<< HEAD
-		for(IResource res : resourceList) {
-			collectAllDiagramFiles(allDiagramFiles, res);
-		}
-		
-		StatisticsDialog dialog = new StatisticsDialog(Display.getCurrent().getActiveShell());
-		dialog.setData(allDiagramFiles);
-		dialog.open();
-		
-		return null;
-	}
-
-	private void collectAllDiagramFiles(List<IFile> allDiagramFiles, IResource selectedResource) {
-		if(selectedResource instanceof IFile) {
-			addFileToDiagramList(allDiagramFiles, selectedResource);
-			System.out.println("file");
-		}
-		else if(selectedResource instanceof IFolder) {
-			getFilesWithinFolder(selectedResource, allDiagramFiles);
-			System.out.println("folder");
-		}
-		else if(selectedResource instanceof IProject) {
-			System.out.println("project");
-=======
-	    IResource resource = null;
-		
-		for(IResource res : resourceList) {
-			collectAllDiagramFiles(allDiagramFiles, res);
-			resource = res;
-		}
-		
-		if (resource == null) {
-			Console.println("Non valid resource selected.");
-			return null;
-		}
-		final StatisticsDialog dialog = new StatisticsDialog(Display.getCurrent().getActiveShell());
-		final URI projectUri = URI.createPlatformResourceURI(resource.getFullPath().toOSString());
-		if (FileHandler.instance.isSPL(projectUri)) {
-			Console.println("[SPL detected]", blue);
-			try {
-				var features = new Features(projectUri);
-				while (features.getNextConfig() != null) {
-					Console.println(" > Configuration: [" + features.getConfigRep() + "]", blue);
-					if (dialog.setDataSPL(allDiagramFiles, features.getConfigRep(), features)) {
-						Console.println(" > Generated data.");
-					} else {
-						Console.println(" > Couldn't generate data.");
-						return null;
-					}
-				}
-			} catch (FeatureCallerException e) {
-				e.printStackTrace();
-				return null;
-			}
-		} else {
-			// set entries 
-			if (dialog.setData(allDiagramFiles)) {
-				Console.println(" > Generated data.");
-			} else {
-				Console.println(" > Couldn't generate data.");
-				return null;
-			}
-		}
-		Console.println("\nStatistics generation done.");
-		long end = System.nanoTime();
-		Console.println("Time needed: " + ((end - start) / 1000000) + "ms");
-		dialog.open();
-		return null;
-	}
-	
-	private void collectAllDiagramFiles(List<IFile> allDiagramFiles, IResource selectedResource) {
-		if(selectedResource instanceof IFile) {
-			addFileToDiagramList(allDiagramFiles, selectedResource);
-			//System.out.println("file");
-		}
-		else if(selectedResource instanceof IFolder) {
-			getFilesWithinFolder(selectedResource, allDiagramFiles);
-			//System.out.println("folder");
-		}
-		else if(selectedResource instanceof IProject) {
-			//System.out.println("project");
->>>>>>> master
-		}
-	}
-	
-	private void getFilesWithinFolder(IResource selectedResource, List<IFile> allDiagramFiles) {
-
-		IFolder folder = (IFolder) selectedResource;
-		IResource[] res;
-		try {
-			res = folder.members();
-			for (IResource r : res) {
-				if (r instanceof IFile) {
-					addFileToDiagramList(allDiagramFiles, r);
-				}
-				if (r instanceof IFolder) {
-					// TODO: handle nested folder
-				}
-			}
-			
-		} catch (CoreException e) {
-			e.printStackTrace();
-		}
-	}
-
-	private void addFileToDiagramList(List<IFile> allDiagramFiles, IResource selectedResource) {
-		if (getExtensionByStringHandling(selectedResource.getFullPath().toString()).get().equals("diagram") ) {
-			allDiagramFiles.add((IFile) selectedResource);
-		}
-	}
-
-	private Optional<String> getExtensionByStringHandling(String filename) {
-	    return Optional.ofNullable(filename)
-	      .filter(f -> f.contains("."))
-	      .map(f -> f.substring(filename.lastIndexOf(".") + 1));
-	}
-
-}
diff --git a/de.tu_bs.cs.isf.cbc.statistics.ui/src/de/tu_bs/cs/isf/cbc/statistics/ui/StatisticsDialog.java.orig b/de.tu_bs.cs.isf.cbc.statistics.ui/src/de/tu_bs/cs/isf/cbc/statistics/ui/StatisticsDialog.java.orig
deleted file mode 100644
index 3da4f9698..000000000
--- a/de.tu_bs.cs.isf.cbc.statistics.ui/src/de/tu_bs/cs/isf/cbc/statistics/ui/StatisticsDialog.java.orig
+++ /dev/null
@@ -1,270 +0,0 @@
-package de.tu_bs.cs.isf.cbc.statistics.ui;
-
-
-<<<<<<< HEAD
-=======
-import java.util.ArrayList;
-import java.util.HashMap;
->>>>>>> master
-import java.util.LinkedList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.dialogs.TitleAreaDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.browser.Browser;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-<<<<<<< HEAD
-=======
-import org.eclipse.swt.widgets.Display;
->>>>>>> master
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Shell;
-
-import de.tu_bs.cs.isf.cbc.statistics.CSVHelper;
-import de.tu_bs.cs.isf.cbc.statistics.StatisticsDatabase;
-import de.tu_bs.cs.isf.cbc.statistics.StatisticsEntry;
-<<<<<<< HEAD
-=======
-import de.tu_bs.cs.isf.cbc.util.Console;
-import de.tu_bs.cs.isf.cbc.util.Features;
->>>>>>> master
-
-
-public class StatisticsDialog extends TitleAreaDialog {
-	
-	private List<?> paths = null;
-	private int numberOfDiagrams;
-<<<<<<< HEAD
-	private List<StatisticsEntry> entries = new LinkedList<StatisticsEntry>();
-	private List<IFile> selectedDiagramFiles = new LinkedList<IFile>();
-=======
-	private boolean isSpl = false;
-	private final List<StatisticsEntry> entries = new LinkedList<StatisticsEntry>();
-	private final List<String> configs = new ArrayList<String>(); 
-	private HashMap<StatisticsEntry, String> configEntries = new HashMap<StatisticsEntry, String>();
-	private List<IFile> selectedDiagramFiles = new LinkedList<IFile>();
-	private boolean configView = false;
-	private Features features = null;
->>>>>>> master
-	
-	public StatisticsDialog(Shell parentShell) {
-		super(parentShell);
-	}
-
-	@Override
-	public void create() {
-		super.create();
-		setTitle("Statistics Viewer");
-	}
-
-	@Override
-	protected Control createDialogArea(Composite parent) {
-		Composite area = (Composite) super.createDialogArea(parent);
-		Composite container = new Composite(area, SWT.NONE);
-		container.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-		GridLayout layout = new GridLayout(2, false);
-		container.setLayout(layout);
-
-		createBrowser(container);
-
-		return area;
-	}
-
-	private void createBrowser(Composite parent) {
-		Browser browser = new Browser(parent, SWT.NONE);
-		GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
-		browser.setLayoutData(gridData);
-		
-		HtmlHandler htmlSite = new HtmlHandler();
-<<<<<<< HEAD
-		htmlSite.setDiagramPaths(paths);
-		htmlSite.setData(numberOfDiagrams, entries, selectedDiagramFiles);
-		String templateHTML = htmlSite.getHtmlString();
-		browser.setText(templateHTML);
-
-=======
-		htmlSite.setConfigView(this.configView);
-		htmlSite.setDiagramPaths(paths);
-		final String templateHTML;
-
-		if (this.isSpl) {
-			htmlSite.setDataSPL(numberOfDiagrams, configEntries, configs, selectedDiagramFiles, features);
-			templateHTML = htmlSite.getHtmlStringSPL();
-		} else {
-			htmlSite.setData(numberOfDiagrams, entries, selectedDiagramFiles);
-			templateHTML = htmlSite.getHtmlString();
-		}
-		if (templateHTML == null) {
-			Console.clear();
-			Console.println("No up to date prove data found.");
-			return;
-		}
-		browser.setText(templateHTML);
->>>>>>> master
-		browser.setFocus();
-	}
-
-	@Override
-	protected void createButtonsForButtonBar(Composite parent) {
-		// create OK and Cancel buttons by default
-//		createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
-<<<<<<< HEAD
-=======
-		if (this.isSpl && this.configView) {
-			createButton(parent, IDialogConstants.OK_ID, "Show Avg View", true);
-		} else if (this.isSpl && !this.configView) {
-			createButton(parent, IDialogConstants.OK_ID, "Show Config View", true);
-		}
->>>>>>> master
-		createButton(parent, IDialogConstants.CLIENT_ID, "Export CSV File", false);
-		createButton(parent, IDialogConstants.CANCEL_ID, "Close", true);
-	}
-
-	@Override
-	protected void buttonPressed(int buttonId) {
-		if (IDialogConstants.OK_ID == buttonId) {
-<<<<<<< HEAD
-			okPressed();
-=======
-			showConfigView();
->>>>>>> master
-		} else if (IDialogConstants.CLIENT_ID == buttonId) {
-			exportCSV();
-		} else if (IDialogConstants.CANCEL_ID == buttonId) {
-			cancelPressed();
-		}
-	}
-<<<<<<< HEAD
-=======
-	
-	private void showConfigView() {
-		if (configEntries == null || configEntries.isEmpty()
-				|| selectedDiagramFiles == null || selectedDiagramFiles.isEmpty()) {
-			return;
-		}
-		this.toggleConfigView();
-		for (var config : configEntries.values()) {
-			setDataSPL(selectedDiagramFiles, config, features);
-		}
-		this.close();
-		this.create();
-		this.open();
-	}
-
-	private void toggleConfigView() {
-		this.configView = !this.configView ;
-	}
->>>>>>> master
-
-	private void exportCSV() {
-	    FileDialog dialog = new FileDialog(getShell(), SWT.SAVE);
-	    dialog.setFilterNames(new String[] { "CSV Files", "All Files (*.*)" });
-	    dialog.setFilterExtensions(new String[] { "*.csv", "*.*" });
-	    
-	    dialog.setFilterPath(selectedDiagramFiles.get(0).getParent().getFullPath().toFile().getAbsolutePath().toString());
-	    dialog.setFileName("statistics.csv");
-	    
-	    String path = dialog.open();
-		CSVHelper helper = new CSVHelper();
-		
-		String errorMessage = helper.generateCSVFile(path, entries);
-		if(errorMessage == null) {
-			MessageDialog.openInformation(getShell(), "Success", "The CSV file was successfully exported.");
-		}
-		else {
-			MessageDialog.openError(getShell(), "Error", "The CSV could not be exported:\n\n"+errorMessage);
-		}
-	}
-
-	@Override
-	protected boolean isResizable() {
-		return true;
-	}
-
-	@Override
-	protected void okPressed() {
-		super.okPressed();
-	}
-
-	@Override
-	protected void cancelPressed() {
-		super.cancelPressed();
-	}
-
-	@Override
-	protected Point getInitialSize() {
-		return new Point(1200, 800);
-	}
-
-<<<<<<< HEAD
-	public void setData(List<IFile> allDiagramFiles) {
-		
-		if (allDiagramFiles.size() < 1) {
-			de.tu_bs.cs.isf.cbc.util.Console.println("No diagram files selected.");
-=======
-	public boolean setDataSPL(final List<IFile> allDiagramFiles, final String configName, final Features features) {
-		this.isSpl = true;
-		this.features = features;
-		if (!this.configs.contains(configName)) {
-			this.configs.add(configName);
-		}
-		if (allDiagramFiles.size() < 1) {
-			de.tu_bs.cs.isf.cbc.util.Console.println("No diagram files selected.");
-			return false;
-		}
-		else {
-			for (IFile file : allDiagramFiles) {
-				for (StatisticsEntry entry : StatisticsDatabase.instance.getConfigEntries(file, configName)) {
-					configEntries.put(entry, configName);
-				}
-			}
-			numberOfDiagrams = allDiagramFiles.size();
-			selectedDiagramFiles = allDiagramFiles;
-		}
-		return true;
-	}
-
-	public boolean setData(List<IFile> allDiagramFiles) {
-		this.isSpl = false;
-		if (allDiagramFiles.size() < 1) {
-			de.tu_bs.cs.isf.cbc.util.Console.println("No diagram files selected.");
-			return false;
->>>>>>> master
-		}
-		else {
-			for (IFile file : allDiagramFiles) {
-				entries.addAll(StatisticsDatabase.instance.getEntriesRelatedTo(file));
-			}
-			numberOfDiagrams = allDiagramFiles.size();
-			selectedDiagramFiles = allDiagramFiles;
-		}
-<<<<<<< HEAD
-=======
-		return true;
->>>>>>> master
-	}
-
-//	private boolean multipleDiagrams(List<StatisticsEntry> entries) {
-//
-//		boolean moreThanOne = false;
-//		
-//		for (int i = 0; entries.size() > i; i++) {
-//			String outterDiagramName = entries.get(i).getMapping().getCorcDiagramName();
-//			for (int j= i + 1; entries.size() > j; j++) {
-//				String innerDiagramName = entries.get(j).getMapping().getCorcDiagramName();
-//				if (!outterDiagramName.equals(innerDiagramName)) {
-//					moreThanOne = true;
-//				}
-//			}
-//			
-//		}
-//		return moreThanOne;
-//	}
-}
\ No newline at end of file
diff --git a/de.tu_bs.cs.isf.cbc.statistics/.classpath.orig b/de.tu_bs.cs.isf.cbc.statistics/.classpath.orig
deleted file mode 100644
index c97385f65..000000000
--- a/de.tu_bs.cs.isf.cbc.statistics/.classpath.orig
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="module" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src-gen"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/de.tu_bs.cs.isf.cbc.statistics/.project.orig b/de.tu_bs.cs.isf.cbc.statistics/.project.orig
deleted file mode 100644
index 218107dfb..000000000
--- a/de.tu_bs.cs.isf.cbc.statistics/.project.orig
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-<<<<<<<< HEAD:de.tu_bs.cs.isf.cbc.statistics/.project
-	<name>de.tu_bs.cs.isf.cbc.statistics</name>
-========
-	<name>de.tu_bs.cs.isf.cbc.parser</name>
->>>>>>>> master:de.tu_bs.cs.isf.cbc.parser/.project
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/de.tu_bs.cs.isf.cbc.statistics/META-INF/MANIFEST.MF.orig b/de.tu_bs.cs.isf.cbc.statistics/META-INF/MANIFEST.MF.orig
deleted file mode 100644
index 3b92f006c..000000000
--- a/de.tu_bs.cs.isf.cbc.statistics/META-INF/MANIFEST.MF.orig
+++ /dev/null
@@ -1,34 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: de.tu_bs.cs.isf.cbc.statistics;singleton:=true
-Bundle-Version: 1.0.0
-Bundle-ClassPath: .
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Automatic-Module-Name: de.tu_bs.cs.isf.cbc.statistics
-<<<<<<< HEAD
-Bundle-RequiredExecutionEnvironment: JavaSE-12
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.key_project.core.symbolic_execution,
- de.tu-bs.cs.isf.cbc.util,
- de.tu-bs.cs.isf.cbc.model,
- org.eclipse.core.resources,
- com.google.guava,
- org.eclipse.jface,
- org.eclipse.ui.workbench
-=======
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;visibility:=reexport,
- de.tu-bs.cs.isf.cbc.model,
- org.eclipse.core.resources,
- com.google.guava,
- org.eclipse.graphiti,
- org.key_project.core.symbolic_execution
->>>>>>> master
-Bundle-ActivationPolicy: lazy
-Export-Package: de.tu_bs.cs.isf.cbc.statistics,
- de.tu_bs.cs.isf.cbc.statistics.impl,
- de.tu_bs.cs.isf.cbc.statistics.util
diff --git a/de.tu_bs.cs.isf.cbc.statistics/src/de/tu_bs/cs/isf/cbc/statistics/FileNameManager.java.orig b/de.tu_bs.cs.isf.cbc.statistics/src/de/tu_bs/cs/isf/cbc/statistics/FileNameManager.java.orig
deleted file mode 100644
index 664c7a1d3..000000000
--- a/de.tu_bs.cs.isf.cbc.statistics/src/de/tu_bs/cs/isf/cbc/statistics/FileNameManager.java.orig
+++ /dev/null
@@ -1,287 +0,0 @@
-package de.tu_bs.cs.isf.cbc.statistics;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.stream.Stream;
-
-import org.eclipse.emf.ecore.EObject;
-
-import com.google.common.hash.Hashing;
-
-import de.tu_bs.cs.isf.cbc.cbcmodel.AbstractStatement;
-import de.tu_bs.cs.isf.cbc.cbcmodel.CompositionStatement;
-import de.tu_bs.cs.isf.cbc.cbcmodel.Condition;
-import de.tu_bs.cs.isf.cbc.cbcmodel.ReturnStatement;
-import de.tu_bs.cs.isf.cbc.cbcmodel.SelectionStatement;
-import de.tu_bs.cs.isf.cbc.cbcmodel.SkipStatement;
-import de.tu_bs.cs.isf.cbc.cbcmodel.SmallRepetitionStatement;
-import de.tu_bs.cs.isf.cbc.cbcmodel.StrengthWeakStatement;
-
-public class FileNameManager {
-
-	private int selectionCounter;
-	private int abstractCounter;
-	private int skipCounter;
-	private int compositionCounter;
-	private int returnCounter;
-	private int repetitionCounter;
-	private int strengthWeakCounter;
-
-	public String getFileName(String problem, String location, AbstractStatement statement, String subProofName)  {
-		EObject root = getRoot(statement);
-		// TODO: delete old key files
-		if (!location.contains("/features/")) { // TODO cleanUp diabled for SPLs, as up to date files are deleted in some configs
-			cleanKeyFiles(location, root);
-		}
-		// if there exists a KeY file with same problem hash -> get the existing name
-		File keyFile = getAlreadyProvenKeyFile(problem, statement, location);
-
-
-		String statementKind = statement.eClass().getName();
-
-
-		selectionCounter = 0;
-		abstractCounter = 0;
-		skipCounter = 0;
-		compositionCounter = 0;
-		returnCounter = 0;
-		repetitionCounter = 0;
-		strengthWeakCounter = 0;
-
-		getKindNumber(root, statement);
-
-		int counter;
-		if (statementKind.equals("SelectionStatement")) {
-			counter = selectionCounter;
-		} else if (statementKind.equals("SkipStatement")) {
-			counter = skipCounter;
-		} else if (statementKind.equals("CompositionStatement")) {
-			counter = compositionCounter;
-		} else if (statementKind.equals("ReturnStatement")) {
-			counter = returnCounter;
-		} else if (statementKind.equals("SmallRepetitionStatement")) {
-			counter = repetitionCounter;
-			statementKind = "RepetitionStatement";
-		} else if (statementKind.equals("StrengthWeakStatement")) {
-			counter = strengthWeakCounter;
-		} else {
-			counter = abstractCounter;
-			statementKind = "Statement";
-		}
-
-		String foundName = "";
-		if (statement instanceof SmallRepetitionStatement) {
-			foundName= "/" + statementKind + counter + subProofName;
-		}
-		else
-			foundName = "/" + statementKind + counter;
-		if (keyFile != null) {
-			// rename existing files
-			String existingName = keyFile.getName();
-			existingName = existingName.substring(0, existingName.length() - 4);
-//			return "/" + existingName;
-			if (!("/" + existingName).equals(foundName)) {
-				File file = new File(location + File.separator + foundName + ".key");
-				if (file.exists()) {
-//				in this case the already existing file will be overwritten
-					System.out.println("not renaming");
-					return foundName;
-				}
-				keyFile.renameTo(file);
-				System.out.println("renaming");
-			}
-		}
-		
-		return foundName;
-	}
-
-	private void cleanKeyFiles(String location, EObject root) {
-		
-		//TODO this method only cleans redundant files -> also clean outdated files (if they do not hold an id existing within diagram)
-
-		List<File> keyFilesInFolder = getKeYFilesFromFolder(location);
-		List<File> redundantFiles = new LinkedList<File>();
-		List<String> foundHashValues = new LinkedList<String>();
-		for (int i = 0; keyFilesInFolder.size() > i; i++) {
-			File outterFile = keyFilesInFolder.get(i);
-			if (outterFile.getName().equals("helper.key")) {
-				continue;
-			}
-			String outterHash = StatisticsDatabase.instance.getHashForKeyFile(outterFile);
-			if (outterHash == null) {
-				redundantFiles.add(outterFile);
-				continue;
-			}
-			if (!outterHash.isEmpty()) {
-				foundHashValues.add(outterHash);
-				for (int j = i + 1; keyFilesInFolder.size() > j; j++) {
-					File innerFile = keyFilesInFolder.get(j);
-					String innerHash = StatisticsDatabase.instance.getHashForKeyFile(innerFile);
-					if (innerHash == null) {
-						if (!innerFile.getName().equals("helper.key"))
-							redundantFiles.add(innerFile);
-						continue;
-					}
-					if (outterHash.equals(innerHash))
-						if (outterFile.lastModified() > innerFile.lastModified())
-							redundantFiles.add(innerFile);
-						else
-							redundantFiles.add(outterFile);
-				}
-			}
-		}
-
-		for (File file : redundantFiles) {
-<<<<<<< HEAD
-			file.delete();
-=======
-			// TODO: Deleting key files leads to worse error tracing. This should be handled differently.
-			//file.delete();
->>>>>>> master
-		}
-
-	}
-	
-	public boolean isKeYFileWithHashProven (String hash, String proveFolderLocation) {
-		List<File> keyFiles = getKeYFilesFromFolder(proveFolderLocation);
-		
-		for (File file : keyFiles) {
-			String hashKeyFile = StatisticsDatabase.instance.getHashForKeyFile(file);
-			if (hashKeyFile != null && hashKeyFile.equals(hash)) {
-				if (StatisticsDatabase.instance.isKeyFileProven(file)) {
-					return true;
-				}
-			}
-		}
-		
-		return false;
-	}
-
-	private List<File> getKeYFilesFromFolder(String location) {
-		List<File> keyFilesInFolder = new LinkedList<File>();
-
-		try (Stream<Path> paths = Files.walk(Paths.get(location))) {
-			paths.filter(Files::isRegularFile).forEach(guas -> keyFilesInFolder.add(guas.toFile()));
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-
-		return keyFilesInFolder;
-	}
-
-	private File getAlreadyProvenKeyFile(String problem, AbstractStatement statement, String location) {
-
-		String hash = Hashing.sha256().hashString(problem, StandardCharsets.UTF_8).toString();
-
-		List<File> keyFilesInFolder = getKeYFilesFromFolder(location);
-		for (File file : keyFilesInFolder) {
-			String existingHash = StatisticsDatabase.instance.getHashForKeyFile(file);
-//			if (file.getName().equals("helper.key"))
-//				continue;
-//			String existingHash = getHashFromKeyFile(file);
-			if (existingHash != null) {
-				if (existingHash.equals(hash)) {
-					return file;
-				}
-			}
-		}
-
-		return null;
-	}
-
-//	private String getHashFromKeyFile(File keyFile) {
-//
-//		Path keyFilePath = Path.of(keyFile.getAbsolutePath());
-//		String fileString = "";
-//		try {
-//			fileString = Files.readString(keyFilePath);
-//		} catch (IOException e) {
-//			System.out.println("read proof file failed - FileNameManager Error: " + e.getMessage());
-//			e.printStackTrace();
-//			return "-1";
-//		}
-//
-//		int startProblem = fileString.indexOf("\\javaSource");
-//
-//		// todo: check if file string is empty
-//		String problem = fileString.substring(startProblem, fileString.length() - 1);
-////		int firstOpeningBracket = problem.indexOf("{");
-//		// todo: proof may not be the next part in every case. use a counter to
-//		// recognize every new opening bracket and decrement if a closing bracket
-//		// appears. then cut string if counter is 0 and a closing bracket appears
-////		int endOfProblem = problem.indexOf("\\proof");
-//		
-//		// Error: it is not possible to get the exact problem string from a key file 
-//		
-//		char[] charactersInProblem = problem.toCharArray();
-//		int indexEndOfProblem = 0;
-//		char lastProblemChar = ' ';
-//		for (char character : charactersInProblem) {
-//			if (character == '{') 
-//				indexEndOfProblem ++;
-//			if (character == '}')
-//				indexEndOfProblem --;
-//			if (indexEndOfProblem == -1) 
-//				lastProblemChar = character;
-//		}
-//		problem = problem.substring(0, problem.indexOf(lastProblemChar));
-//
-////		problem = problem.substring(0, problem.lastIndexOf("}"));
-//		problem = problem.trim();
-//
-//		// TODO: throw exception if problem is null
-//		String hash = Hashing.sha256().hashString(problem, StandardCharsets.UTF_8).toString();
-//
-//		return hash;
-//	}
-
-	private boolean getKindNumber(EObject root, AbstractStatement statement) {
-
-		// depth-first search for selection statement
-		for (int i = 0; i < root.eContents().size(); i++) {
-			EObject content = root.eContents().get(i);
-			if (content instanceof Condition) {
-				continue;
-			}
-			if (content instanceof SelectionStatement)
-				selectionCounter = selectionCounter + 1;
-			else if (content instanceof SkipStatement)
-				skipCounter++;
-			else if (content instanceof CompositionStatement)
-				compositionCounter++;
-			else if (content instanceof ReturnStatement)
-				returnCounter++;
-			else if (content instanceof SmallRepetitionStatement)
-				repetitionCounter++;
-			else if (content instanceof StrengthWeakStatement)
-				strengthWeakCounter++;
-			else if (content instanceof AbstractStatement && ((AbstractStatement) content).getRefinement() == null)
-				abstractCounter++;
-			if (content.equals(statement))
-				return true;
-
-			// if there are no children: counter for abstract statement can be increased by
-			// 1
-			if (content.eContents().size() > 0)
-				if (getKindNumber(content, statement))
-					return true;
-		}
-		return false;
-	}
-
-	private EObject getRoot(AbstractStatement statement) {
-
-		EObject currentObject = statement.eContainer();
-		while (currentObject.eClass().getName() != "CbCFormula") {
-			currentObject = currentObject.eContainer();
-		}
-		return currentObject;
-	}
-
-}
diff --git a/de.tu_bs.cs.isf.cbc.statistics/src/de/tu_bs/cs/isf/cbc/statistics/StatisticsDatabase.java.orig b/de.tu_bs.cs.isf.cbc.statistics/src/de/tu_bs/cs/isf/cbc/statistics/StatisticsDatabase.java.orig
deleted file mode 100644
index 2deac67a8..000000000
--- a/de.tu_bs.cs.isf.cbc.statistics/src/de/tu_bs/cs/isf/cbc/statistics/StatisticsDatabase.java.orig
+++ /dev/null
@@ -1,519 +0,0 @@
-package de.tu_bs.cs.isf.cbc.statistics;
-
-import java.io.File;
-import java.io.IOException;
-<<<<<<< HEAD
-=======
-import java.util.ArrayList;
->>>>>>> master
-import java.util.Collections;
-import java.util.Date;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-
-import de.tu_bs.cs.isf.cbc.cbcmodel.AbstractStatement;
-import de.tu_bs.cs.isf.cbc.cbcmodel.CbCFormula;
-import de.tu_bs.cs.isf.cbc.cbcmodel.SmallRepetitionStatement;
-import de.tu_bs.cs.isf.cbc.cbcmodel.StrengthWeakStatement;
-<<<<<<< HEAD
-=======
-import de.tu_bs.cs.isf.cbc.statistics.StatisticsRegistry;
->>>>>>> master
-
-public class StatisticsDatabase {
-
-	private static final String PLUGIN_ID = "de.tu_bs.cs.isf.cbc.statistics";
-
-	public static StatisticsDatabase instance = new StatisticsDatabase();
-
-	private StatisticsRegistry registry;
-	private ResourceSet resourceSet = new ResourceSetImpl();
-
-	private StatisticsDatabase() {
-		IPath pluginStateFolderPath = Platform.getStateLocation(Platform.getBundle(PLUGIN_ID));
-		File pluginStateFolder = pluginStateFolderPath.toFile();
-
-		String folderName = "XMLStatisticsDatabase";
-
-		String rootLocation = pluginStateFolder.getAbsolutePath() + File.separator + folderName + File.separator;
-		File rFile = new File(rootLocation);
-		rFile.mkdir();
-
-		String xmlLocation = rootLocation + "satisticsDatabase.xml";
-		Resource resource;
-		try {
-			resource = resourceSet.getResource(URI.createFileURI(xmlLocation), true);
-		} catch (Exception e) {
-			resource = resourceSet.createResource(URI.createFileURI(xmlLocation));
-		}
-		if (resource.getContents().isEmpty()) {
-			resource.getContents().add(statisticsFactory.eINSTANCE.createStatisticsRegistry());
-		}
-		registry = (StatisticsRegistry) resource.getContents().get(0);
-	}
-
-	public void saveToDatabase(StatisticsEntry entry) {
-		registry.getEntries().add(entry);
-		saveRegistry();
-	}
-<<<<<<< HEAD
-=======
-	
-	public void saveToDatabase(List<StatisticsEntry> keyData) {
-		for (StatisticsEntry entry : keyData) {
-			updateEntry(entry);
-			saveRegistry();
-		}
-	}
-	
-	private void updateEntry(StatisticsEntry entry) {
-		for (int i = 0; i < registry.getEntries().size(); i++) {
-			if (registry.getEntries().get(i).getMapping().getKeyProofProblemHashValue().equals(entry.getMapping().getKeyProofProblemHashValue())) {
-				registry.getEntries().remove(registry.getEntries().get(i));
-			}
-			registry.getEntries().add(entry);
-		}
-	}
->>>>>>> master
-
-	private void saveRegistry() {
-		try {
-			registry.eResource().save(Collections.EMPTY_MAP);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-
-<<<<<<< HEAD
-	public List<StatisticsEntry> getEntriesRelatedTo(IFile file) {
-		// TODO: maybe save more redundant information to make it more robust
-
-		List<StatisticsEntry> validDBEntries = new LinkedList<StatisticsEntry>();
-
-//		System.out.println("File: " + file);
-		List<StatisticsEntry> affectedEntriesInDB = new LinkedList<StatisticsEntry>();
-		for (StatisticsEntry entry : registry.getEntries()) {
-
-=======
-	public List<StatisticsEntry> getConfigEntries(final IFile file, String configName) {
-		// TODO: maybe save more redundant information to make it more robust
-		final List<StatisticsEntry> validDBEntries = new ArrayList<StatisticsEntry>();
-		List<StatisticsEntry> affectedEntriesInDB = new ArrayList<StatisticsEntry>();
-		
-		configName = configName.replaceAll(",\\s", "");
-		for (StatisticsEntry entry : registry.getEntries()) {
->>>>>>> master
-			// TODO: replace entryPath with diagram name which is new in statistics model
-			String entryPath;
-			if (entry.getMapping().getKeyFilePath() != null) {
-				entryPath = entry.getMapping().getKeyFilePath().toString();
-
-			} else
-				continue;
-<<<<<<< HEAD
-//				Path filePath = new Path(file.getRawLocation().toString());
-
-			String filePath = file.getFullPath().toString();
-			int indexLastSeparator = filePath.lastIndexOf("/") + 1;
-			int indexExtension = filePath.indexOf(".diagram");
-			String affectedDiagram = filePath.substring(indexLastSeparator, indexExtension);
-
-			int indexLastSeperatorEntry = entryPath.lastIndexOf(File.separator);
-			entryPath = entryPath.substring(0, indexLastSeperatorEntry);
-			// adding 6 because of prove string
-			indexLastSeperatorEntry = entryPath.lastIndexOf(File.separator) + 6;
-
-			// TODO added question for length, as problems occur for spls, folder named as config
-			String entryFolder = entryPath.substring(indexLastSeperatorEntry < entryPath.length() ? indexLastSeperatorEntry : entryPath.length(), entryPath.length());
-
-//				System.out.println(affectedDiagram);
-			if (entryFolder.equals(affectedDiagram)) {
-				affectedEntriesInDB.add(entry);
-//				System.out.println("equal path found");
-=======
-
-			String filePath = file.getFullPath().toOSString();
-			// first check whether the file is located in the same project/branch as the entry
-			String branch = filePath.substring(0, filePath.lastIndexOf(File.separator));
-			if (!entryPath.contains(branch)) {
-				continue;
-			}
-			final String affectedDiagram = filePath.substring(filePath.lastIndexOf(File.separator) + 1, filePath.indexOf(".diagram"));
-
-			if (entryPath.indexOf("prove") == -1) {
-				continue;
-			}
-			String entryFolder = entryPath.substring(entryPath.indexOf("prove") + "prove".length(), entryPath.length());
-			if (entryFolder.chars().filter(c -> c == File.separator.charAt(0)).count() != 2) {
-				continue;
-			}
-			final String entryConfig = entryFolder.substring(entryFolder.indexOf(File.separator) + File.separator.length(), entryFolder.lastIndexOf(File.separator)); 
-			if (!entryConfig.equals(configName)) {
-				continue;
-			}
-			entryFolder = entryFolder.substring(0, entryFolder.indexOf(File.separator));
-			if (entryFolder.equals(affectedDiagram)) {
-				affectedEntriesInDB.add(entry);
-			}
-		}
-
-		if (!affectedEntriesInDB.isEmpty()) {
-			//affectedEntriesInDB = removeOutdated(affectedEntriesInDB);
-			validDBEntries.addAll(getLatestEntriesWithRedundantID(affectedEntriesInDB));
-		}
-
-		return validDBEntries;
-	}
-
-	public List<StatisticsEntry> getEntriesRelatedTo(final IFile file) {
-		// TODO: maybe save more redundant information to make it more robust
-		final List<StatisticsEntry> validDBEntries = new LinkedList<StatisticsEntry>();
-		List<StatisticsEntry> affectedEntriesInDB = new LinkedList<StatisticsEntry>();
-
-		for (StatisticsEntry entry : registry.getEntries()) {
-
-			// TODO: replace entryPath with diagram name which is new in statistics model
-			final String entryPath;
-			if (entry.getMapping().getKeyFilePath() != null) {
-				entryPath = entry.getMapping().getKeyFilePath().toString();
-
-			} else
-				continue;
-
-			final String filePath = file.getFullPath().toOSString();
-			// first check whether the file is located in the same project/branch as the entry
-			final String branch = filePath.substring(0, filePath.lastIndexOf(File.separator));
-			if (!entryPath.contains(branch)) {
-				continue;
-			}
-			final String affectedDiagram = filePath.substring(filePath.lastIndexOf(File.separator) + 1, filePath.indexOf(".diagram"));
-
-			if (entryPath.indexOf("prove") == -1) {
-				continue;
-			}
-			String entryFolder = entryPath.substring(entryPath.indexOf("prove") + "prove".length(), entryPath.length());
-			if (entryFolder.contains(File.separator)) {
-				entryFolder = entryFolder.substring(0, entryFolder.indexOf(File.separator));
-			}
-			
-			if (entryFolder.equals(affectedDiagram)) {
-				affectedEntriesInDB.add(entry);
->>>>>>> master
-			}
-		}
-
-		if (!affectedEntriesInDB.isEmpty()) {
-			affectedEntriesInDB = removeOutdated(affectedEntriesInDB);
-			validDBEntries.addAll(getLatestEntriesWithRedundantID(affectedEntriesInDB));
-		}
-
-		return validDBEntries;
-
-	}
-
-	public StatisticsEntry getLastEntrysRelatedToKeyFile(IFile file) {
-		
-		List<StatisticsEntry> validDBEntries = new LinkedList<StatisticsEntry>();
-		List<StatisticsEntry> affectedEntriesInDB = new LinkedList<StatisticsEntry>();
-		
-//		System.out.println("File: " + file);
-		for (StatisticsEntry entry : registry.getEntries()) {
-
-			String entryPath;
-			if (entry.getMapping().getKeyFilePath() != null) {
-				entryPath = entry.getMapping().getKeyFilePath().toString();
-
-			} else
-				continue;
-
-			String filePath = file.getRawLocation().toString();
-			entryPath = entryPath.replace(File.separator, "/");
-
-			if (entryPath.equals(filePath)) {
-				affectedEntriesInDB.add(entry);
-//				System.out.println("equal path found");
-			}
-		}
-		if (!affectedEntriesInDB.isEmpty()) {
-			affectedEntriesInDB = removeOutdated(affectedEntriesInDB);
-			validDBEntries.addAll(getLatestEntriesWithRedundantID(affectedEntriesInDB));
-		}
-
-		
-		if (validDBEntries == null || validDBEntries.isEmpty()) {
-			return null;
-		}
-		return validDBEntries.get(validDBEntries.size() - 1);
-	}
-
-	private List<StatisticsEntry> removeOutdated(List<StatisticsEntry> entries) {
-
-		List<StatisticsEntry> validEntries = new LinkedList<StatisticsEntry>();
-
-		for (StatisticsEntry entry : entries) {
-			String elementId = entry.getMapping().getCorcElementId();
-			String pathString = entry.getMapping().getCorcDiagramPath();
-			if (!isOutdated(elementId, pathString)) {
-				validEntries.add(entry);
-			}
-		}
-		return validEntries;
-	}
-
-	public boolean isOutdated(String elementId, String pathString) {
-
-		pathString = pathString.replace(".diagram", ".cbcmodel");
-		URI uri = URI.createPlatformResourceURI(pathString, false);
-
-		Resource resource;
-		try {
-			resource = resourceSet.getResource(uri, true);
-		} catch (Exception e) {
-			resource = resourceSet.createResource(uri);
-		}
-
-		for (int i = 0; i < resource.getContents().size(); i++) {
-			if (resource.getContents().get(i) instanceof CbCFormula) {
-				CbCFormula formula = (CbCFormula) resource.getContents().get(i);
-
-				if (findAbstractStatementById(formula, elementId) != null) {
-					return false;
-				}
-			}
-		}
-
-		return true;
-	}
-
-	private AbstractStatement findAbstractStatementById(EObject e, String id) {
-		if (e instanceof AbstractStatement) {
-			if (((AbstractStatement) e).getId().equals(id))
-				return (AbstractStatement) e;
-		}
-		// e is not what we are looking for!
-		for (EObject child : e.eContents()) {
-			AbstractStatement foundStmt = findAbstractStatementById(child, id);
-			if (foundStmt != null)
-				return foundStmt;
-		}
-		return null;
-	}
-
-	private List<StatisticsEntry> getLatestEntriesWithRedundantID(List<StatisticsEntry> entries) {
-
-		List<StatisticsEntry> olderEntriesWithRedundantId = new LinkedList<StatisticsEntry>();
-		List<StatisticsEntry> oldRepetitionEntries = new LinkedList<StatisticsEntry>();
-		List<StatisticsEntry> oldStrongWeakEntries = new LinkedList<StatisticsEntry>();
-
-		for (int i = 0; entries.size() > i; i++) {
-			StatisticsEntry outterEntry = entries.get(i);
-			String id = outterEntry.getMapping().getCorcElementId();
-			if (outterEntry.getMapping().getCorcElementStatement() instanceof SmallRepetitionStatement) {
-				oldRepetitionEntries.add(outterEntry);
-			} else if (outterEntry.getMapping().getCorcElementStatement() instanceof StrengthWeakStatement) {
-				oldStrongWeakEntries.add(outterEntry);
-			} else {
-				for (int j = i + 1; entries.size() > j; j++) {
-					StatisticsEntry innerEntry = entries.get(j);
-					if (id.equals(entries.get(j).getMapping().getCorcElementId())) {
-
-						Date outterEntryDate = outterEntry.getData().getTimestamp();
-						Date innerEntryDate = innerEntry.getData().getTimestamp();
-						if (outterEntryDate.after(innerEntryDate)) {
-							olderEntriesWithRedundantId.add(innerEntry);
-						} else {
-							olderEntriesWithRedundantId.add(outterEntry);
-						}
-					}
-				}
-			}
-		}
-
-		// TODO: check if null
-		if (oldRepetitionEntries.size() > 3) {
-			oldRepetitionEntries.remove(getLatestPrecondition(oldRepetitionEntries));
-			oldRepetitionEntries.remove(getLatestPostcondition(oldRepetitionEntries));
-			oldRepetitionEntries.remove(getLatestVariant(oldRepetitionEntries));
-			entries.removeAll(oldRepetitionEntries);
-		}
-		// for this statement only pre and post
-		if (oldStrongWeakEntries.size() > 2) {
-			oldStrongWeakEntries.remove(getLatestPostcondition(oldStrongWeakEntries));
-			oldStrongWeakEntries.remove(getLatestPrecondition(oldStrongWeakEntries));
-			entries.removeAll(oldStrongWeakEntries);
-		}
-
-		entries.removeAll(olderEntriesWithRedundantId);
-		return entries;
-	}
-
-	// TODO: split the string to not check the path 
-	private StatisticsEntry getLatestVariant(List<StatisticsEntry> oldRepetitionEntries) {
-		StatisticsEntry latestVariant = null;
-		for (StatisticsEntry entry : oldRepetitionEntries) {
-			String path = entry.getMapping().getKeyFilePath();
-			if (path.contains("variant")) {
-				latestVariant = entry;
-			}
-		}
-		return latestVariant;
-	}
-
-	// TODO: split the string to not check the path 
-	private StatisticsEntry getLatestPostcondition(List<StatisticsEntry> oldRepetitionEntries) {
-		StatisticsEntry latestPostcondition = null;
-		for (StatisticsEntry entry : oldRepetitionEntries) {
-			String path = entry.getMapping().getKeyFilePath();
-			if (path.contains("postcondition")) {
-				latestPostcondition = entry;
-			}
-		}
-		return latestPostcondition;
-	}
-
-	// TODO: split the string to not check the path 
-	private StatisticsEntry getLatestPrecondition(List<StatisticsEntry> oldRepetitionEntries) {
-		StatisticsEntry latestPrecondition = null;
-		for (StatisticsEntry entry : oldRepetitionEntries) {
-			String path = entry.getMapping().getKeyFilePath();
-			if (path.contains("precondition")) {
-				latestPrecondition = entry;
-			}
-		}
-		return latestPrecondition;
-	}
-
-	public String getHashForKeyFile(File keyFile) {
-		
-		List<StatisticsEntry> validDBEntries = new LinkedList<StatisticsEntry>();
-		List<StatisticsEntry> affectedEntriesInDB = new LinkedList<StatisticsEntry>();
-		
-//		System.out.println("File: " + keyFile);
-		for (StatisticsEntry entry : registry.getEntries()) {
-
-			String entryPath;
-			if (entry.getMapping().getKeyFilePath() != null) {
-				entryPath = entry.getMapping().getKeyFilePath().toString();
-
-			} else
-				continue;
-
-			String filePath = keyFile.getPath().toString();
-//			entryPath = entryPath.replace(File.separator, "/");
-
-			if (entryPath.equals(filePath)) {
-				affectedEntriesInDB.add(entry);
-//				System.out.println("equal path found");
-			}
-		}
-		if (!affectedEntriesInDB.isEmpty()) {
-			affectedEntriesInDB = removeOutdated(affectedEntriesInDB);
-			validDBEntries.addAll(getLatestEntriesWithRedundantID(affectedEntriesInDB));
-		}
-
-		
-		if (validDBEntries == null || validDBEntries.isEmpty()) {
-			return null;
-		}
-		
-		return validDBEntries.get(validDBEntries.size()-1).getMapping().getKeyProofProblemHashValue();
-	}
-
-	public List<IFile> getKeYFilesForId(String searchedId) {
-
-		List<StatisticsEntry> validDBEntries = new LinkedList<StatisticsEntry>();
-		List<StatisticsEntry> affectedEntriesInDB = new LinkedList<StatisticsEntry>();
-		
-		for (StatisticsEntry entry : registry.getEntries()) {
-
-			String entryId;
-			if (entry.getMapping().getKeyFilePath() != null) {
-				entryId = entry.getMapping().getCorcElementId();
-
-			} else
-				continue;
-			
-			if (entryId != null) {				
-				if (entryId.equals(searchedId)) {
-					affectedEntriesInDB.add(entry);
-				}
-			}
-		}
-		if (!affectedEntriesInDB.isEmpty()) {
-			affectedEntriesInDB = removeOutdated(affectedEntriesInDB);
-			validDBEntries.addAll(getLatestEntriesWithRedundantID(affectedEntriesInDB));
-		}
-
-		
-		if (validDBEntries == null || validDBEntries.isEmpty()) {
-			return null;
-		}
-
-		List<IFile> affectedFiles = new LinkedList<IFile>();
-		for (StatisticsEntry entry : validDBEntries) {
-			File file = new File(entry.getMapping().getKeyFilePath());
-			java.net.URI location = file.toURI();
-			IFile[] files = ResourcesPlugin
-			   .getWorkspace()
-			   .getRoot()
-			   .findFilesForLocationURI( location );
-			affectedFiles.add(files[0]);
-		}
-		
-		return affectedFiles;
-		
-	}
-
-	public boolean isKeyFileProven(File file) {
-		List<StatisticsEntry> validDBEntries = new LinkedList<StatisticsEntry>();
-		List<StatisticsEntry> affectedEntriesInDB = new LinkedList<StatisticsEntry>();
-		
-		for (StatisticsEntry entry : registry.getEntries()) {
-
-			String entryPath;
-			if (entry.getMapping().getKeyFilePath() != null) {
-				entryPath = entry.getMapping().getKeyFilePath().toString();
-
-			} else
-				continue;
-
-			String filePath = file.getPath().toString();
-
-			if (entryPath.equals(filePath)) {
-				affectedEntriesInDB.add(entry);
-			}
-		}
-		if (!affectedEntriesInDB.isEmpty()) {
-			affectedEntriesInDB = removeOutdated(affectedEntriesInDB);
-			validDBEntries.addAll(getLatestEntriesWithRedundantID(affectedEntriesInDB));
-		}
-
-		
-		if (validDBEntries == null || validDBEntries.isEmpty()) {
-			return false;
-		}
-		
-//		return validDBEntries.get(validDBEntries.size()-1).getMapping().getKeyProofProblemHashValue();
-		if ( validDBEntries.get(validDBEntries.size()-1).getData().isIsProven())
-			return true;
-		return false;
-	}
-<<<<<<< HEAD
-=======
-
-
->>>>>>> master
-	
-	
-
-}
diff --git a/de.tu_bs.cs.isf.commands.toolbar/.classpath.orig b/de.tu_bs.cs.isf.commands.toolbar/.classpath.orig
deleted file mode 100644
index 9edb48169..000000000
--- a/de.tu_bs.cs.isf.commands.toolbar/.classpath.orig
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-<<<<<<< HEAD
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-=======
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-16">
->>>>>>> master
-		<attributes>
-			<attribute name="module" value="true"/>
-		</attributes>
-	</classpathentry>
-<<<<<<< HEAD
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-=======
->>>>>>> master
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/de.tu_bs.cs.isf.commands.toolbar/META-INF/MANIFEST.MF.orig b/de.tu_bs.cs.isf.commands.toolbar/META-INF/MANIFEST.MF.orig
deleted file mode 100644
index 183f6d4c7..000000000
--- a/de.tu_bs.cs.isf.commands.toolbar/META-INF/MANIFEST.MF.orig
+++ /dev/null
@@ -1,34 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Toolbar
-Bundle-SymbolicName: de.tu_bs.cs.isf.commands.toolbar;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.resources,
- de.tu-bs.cs.isf.cbc.util;bundle-version="1.0.0",
- org.eclipse.core.resources,
- de.tu-bs.cs.isf.cbc.model,
-<<<<<<< HEAD
- org.eclipse.emf.ecore.xmi,
- org.eclipse.jface
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: de.tu_bs.cs.isf.cbc.tool.helper,
- de.tu_bs.cs.isf.corc.predicateWizard,
- org.eclipse.jdt.core,
- org.eclipse.jdt.internal.compiler.batch,
- org.eclipse.jdt.internal.core,
- org.eclipse.jface.text,
- org.emftext.language.java.containers
-=======
- org.emftext.language.java,
- org.eclipse.emf.ecore.xmi,
- de.ovgu.featureide.fm.core
-Bundle-RequiredExecutionEnvironment: JavaSE-16
-Import-Package: newDiagramWizard,
- org.eclipse.core.runtime;version="3.7.0",
- org.eclipse.graphiti.mm.pictograms;version="0.18.0",
- org.eclipse.jdt.internal.core,
- org.emftext.language.java.containers,
- org.emftext.language.java.resource.java.util
-Export-Package: de.tu_bs.cs.isf.commands.toolbar.handler.family
->>>>>>> master
diff --git a/de.tu_bs.cs.isf.commands.toolbar/plugin.xml.orig b/de.tu_bs.cs.isf.commands.toolbar/plugin.xml.orig
deleted file mode 100644
index 8a51691bb..000000000
--- a/de.tu_bs.cs.isf.commands.toolbar/plugin.xml.orig
+++ /dev/null
@@ -1,279 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-   <extension
-         point="org.eclipse.ui.menus">
-      <menuContribution
-            locationURI="menu:org.eclipse.ui.main.menu">
-         <menu
-               label="File">
-            <command
-                  commandId="org.eclipse.ui.file.exit"
-                  label="Exit">
-            </command>
-         </menu>
-      </menuContribution>
-   </extension>
-   <extension
-         point="org.eclipse.ui.commands">
-      <command
-<<<<<<< HEAD
-=======
-      		defaultHandler="de.tu_bs.cs.isf.commands.toolbar.handler.family.GenerateMetaProductHandler"
-            id="de.tu_bs.cs.isf.commands.toolbar.commandMeta"
-      		name="MetaProduct">
-      </command>
-      <command
->>>>>>> master
-            defaultHandler="de.tu_bs.cs.isf.commands.toolbar.handler.VerifyHandler"
-            id="de.tu_bs.cs.isf.commands.toolbar.command"
-            name="VerifyStatements">
-      </command>
-      <command
-            defaultHandler="de.tu_bs.cs.isf.commands.toolbar.handler.GenerateHandler"
-            id="de.tu_bs.cs.isf.commands.toolbar.command1"
-            name="GenerateGraphical">
-      </command>
-      <command
-            defaultHandler="de.tu_bs.cs.isf.commands.toolbar.handler.VerifyWithKeYHandler"
-            id="de.tu_bs.cs.isf.commands.toolbar.command3"
-            name="VerifyWithKeY">
-      </command>
-   </extension>
-   <extension
-         point="org.eclipse.ui.menus">
-<<<<<<< HEAD
-      <menuContribution
-            allPopups="true"
-            locationURI="popup:org.eclipse.ui.popup.any?after=additions">
-         <command
-               commandId="de.tu_bs.cs.isf.commands.toolbar.predicateManagement"
-               icon="icons/predicatemanager.png"
-               id="de.tu_bs.cs.isf.commands.toolbar.predicateManagement.mapping"
-               label="Open Predicate Management"
-               style="push">
-            <visibleWhen
-                  checkEnabled="false">
-               <iterate
-                     ifEmpty="false"
-                     operator="or">
-                  <test
-                        property="org.eclipse.core.resources.name"
-                        value="*.diagram">
-                  </test>
-               </iterate>
-            </visibleWhen>
-         </command>
-      </menuContribution>
-   </extension>
-   <extension
-         point="org.eclipse.ui.menus">
-=======
-      <menuContribution 
-            locationURI="popup:org.eclipse.ui.popup.any">
-      		<command 
-      			  commandId="de.tu_bs.cs.isf.commands.toolbar.commandMeta"
-      			  label="Generate Meta Product">
-      		</command>
-      </menuContribution>
->>>>>>> master
-      <menuContribution
-            allPopups="false"
-            locationURI="toolbar:org.eclipse.ui.main.toolbar">
-         <toolbar
-               id="de.tu_bs.cs.isf.commands.toolbar.toolbar">
-            <command
-                  commandId="de.tu_bs.cs.isf.commands.toolbar.command"
-                  icon="icons/keyproved16.png"
-                  label="Verify Statements"
-                  style="push">
-            </command>
-            <command
-                  commandId="de.tu_bs.cs.isf.commands.toolbar.command1"
-                  icon="icons/diagram.gif"
-                  label="Generate Graphical Representation"
-                  style="push">
-            </command>
-            <command
-                  commandId="de.tu_bs.cs.isf.commands.toolbar.command3"
-                  icon="icons/green.GIF"
-                  label="Verify with KeY"
-                  style="push">
-            </command>
-<<<<<<< HEAD
-            <command
-                  commandId="de.tu_bs.cs.isf.commands.toolbar.predicateManagement"
-                  icon="icons/predicatemanager.png"
-                  label="Predicate Management"
-                  style="push">
-            </command>
-=======
->>>>>>> master
-         </toolbar>
-      </menuContribution>
-   </extension>
-   
-   
-   
-    <extension point="org.eclipse.ui.commands">
-     <category id="de.tu_bs.cs.isf.commands.toolbar.category1" name="DropDown Examples">
-     </category>
-     <command categoryId="de.tu_bs.cs.isf.commands.toolbar.category1" defaultHandler="de.tu_bs.cs.isf.commands.toolbar.handler.GenerateModelAndDiagramHandler"  
-              id="de.tu_bs.cs.isf.commands.toolbar.command2" name="Drop">
-        <commandParameter id="de.tu_bs.cs.isf.commands.toolbar.msg" name="Message" optional="true">
-        </commandParameter>
-     </command>
-  </extension>
-  
-     <extension point="org.eclipse.ui.menus">
-     <menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar?after=additions">
-        <toolbar id="de.tu_bs.cs.isf.commands.toolbar.toolbar">
-           <command commandId="de.tu_bs.cs.isf.commands.toolbar.command2" id="de.tu_bs.cs.isf.commands.toolbar.command2" style="pulldown" 
-                    icon="icons/GenerateDiagramAndModel2.png"
-                    tooltip="Generate model and diagram">
-           </command>
-        </toolbar>
-     </menuContribution>
-  </extension>
-  
-  <extension point="org.eclipse.ui.menus">
-     <menuContribution locationURI="menu:de.tu_bs.cs.isf.commands.toolbar.command2">
-        <command commandId="de.tu_bs.cs.isf.commands.toolbar.command2" label="With contract" style="push">
-           <parameter name="de.tu_bs.cs.isf.commands.toolbar.msg" value="Contract">
-           </parameter>
-        </command>
-        <separator name="additions" visible="false">
-        </separator>
-        <command commandId="de.tu_bs.cs.isf.commands.toolbar.command2" label="Without contract" style="push">
-           <parameter name="de.tu_bs.cs.isf.commands.toolbar.msg" value="NoContract">
-           </parameter>
-        </command>
-     </menuContribution>
-  </extension>
-  
-  <extension point= "org.eclipse.ui.menus" >
-  <menuContribution 
-  locationURI = "popup:org.eclipse.ui.popup.any" >
-  <command commandId= "de.tu_bs.cs.isf.commands.toolbar.generateDiagramsFromClassCommand"> label="Generate CbC Diagrams from Class"
-  <visibleWhen>
-	<with variable="activeMenuSelection">
-		<iterate
-			ifEmpty="false">
-			<adapt type="org.eclipse.core.resources.IResource">
-				<test property="org.eclipse.core.resources.name" value="*.java" />
-			</adapt>
-		</iterate>
-	</with>
-  </visibleWhen>
-  </command>
-  </menuContribution>
-  <menuContribution
-        locationURI="popup:org.eclipse.ui.popup.any">
-     <command
-           commandId="de.tu_bs.cs.isf.commands.toolbar.generateClassesFromInterfacesCommand">
-        label="Generate CbC Diagrams from Class"
-        <visibleWhen>
-           <with
-                 variable="activeMenuSelection">
-              <iterate
-                    ifEmpty="false">
-                 <or>
-                    <adapt
-                          type="org.eclipse.core.resources.IProject">
-                    </adapt>
-                    <test
-                          property="org.eclipse.core.resources.name"
-                          value="*.tc">
-                    </test>
-                 </or>
-              </iterate>
-           </with>
-        </visibleWhen>
-     </command>
-  </menuContribution>
-  </extension>
-  
-	<extension point="org.eclipse.ui.commands">
-	<command id="de.tu_bs.cs.isf.commands.toolbar.generateDiagramsFromClassCommand" defaultHandler="de.tu_bs.cs.isf.commands.toolbar.handler.GenerateDiagramsFromClassHandler" name="Generate Diagrams from Class">
-	</command>
- <command
-       defaultHandler="de.tu_bs.cs.isf.commands.toolbar.handler.GenerateClassesFromInterfacesHandler"
-       id="de.tu_bs.cs.isf.commands.toolbar.generateClassesFromInterfacesCommand"
-       name="Check Trait Composition">
- </command>
-	</extension>
-	
-	<extension point= "org.eclipse.ui.menus" >
-  <menuContribution 
-  locationURI = "popup:org.eclipse.ui.popup.any" >
-  <command commandId= "de.tu_bs.cs.isf.commands.toolbar.generateJavaCodeCommand"> label="Generate CbC Diagrams from Class"
-  <visibleWhen>
-	<with variable="activeMenuSelection">
-		<iterate
-			ifEmpty="false">
-				<or>
-				<test property="org.eclipse.core.resources.name" value="*.cbcmodel" />
-				<test property="org.eclipse.core.resources.name" value="*.cbcclass" />
-				<test property="org.eclipse.core.resources.name" value="*.diagram" />
-				</or>
-
-		</iterate>
-	</with>
-  </visibleWhen>
-  </command>
-  </menuContribution>
-  </extension>
-  
-	<extension point="org.eclipse.ui.commands">
-<<<<<<< HEAD
-	<command id="de.tu_bs.cs.isf.commands.toolbar.generateJavaCodeCommand" defaultHandler="de.tu_bs.cs.isf.commands.toolbar.handler.GenerateJavaCodeHandler" name="Generate Java Code">
-	</command>
-	</extension>
- <extension
-       point="org.eclipse.ui.commands">
-    <command
-          defaultHandler="de.tu_bs.cs.isf.commands.toolbar.handler.PredicateWizardHandler"
-          id="de.tu_bs.cs.isf.commands.toolbar.predicateManagement"
-          name="Manage Predicates command">
-    </command>
- </extension>
-=======
-		<command 
-			id="de.tu_bs.cs.isf.commands.toolbar.generateJavaCodeCommand" 
-			defaultHandler="de.tu_bs.cs.isf.commands.toolbar.handler.GenerateJavaCodeHandler" 
-			name="Generate Java Code">
-		</command>
-	</extension>
-	
-	
-	
-	<extension point= "org.eclipse.ui.menus" >
-  <menuContribution 
-  locationURI = "popup:org.eclipse.ui.popup.any" >
-  <command commandId= "de.tu_bs.cs.isf.commands.toolbar.generateProductVariant" label="Generate Product Variant">
-  <visibleWhen>
-	<with variable="activeMenuSelection">
-		<iterate
-			ifEmpty="false">
-				
-				<test property="org.eclipse.core.resources.name" value="*.xml" />
-				
-
-		</iterate>
-	</with>
-  </visibleWhen>
-  </command>
-  </menuContribution>
-  </extension>
-  
-	<extension point="org.eclipse.ui.commands">
-		<command 
-			id="de.tu_bs.cs.isf.commands.toolbar.generateProductVariant" 
-			defaultHandler="de.tu_bs.cs.isf.commands.toolbar.handler.GenerateProductVariantHandler" 
-			name="Generate Product Variant">
-		</command>
-	</extension>
-	
->>>>>>> master
-
-</plugin>
diff --git a/de.tu_bs.cs.isf.commands.toolbar/src/de/tu_bs/cs/isf/commands/toolbar/handler/GenerateClassesFromInterfacesHandler.java.orig b/de.tu_bs.cs.isf.commands.toolbar/src/de/tu_bs/cs/isf/commands/toolbar/handler/GenerateClassesFromInterfacesHandler.java.orig
deleted file mode 100644
index df939f607..000000000
--- a/de.tu_bs.cs.isf.commands.toolbar/src/de/tu_bs/cs/isf/commands/toolbar/handler/GenerateClassesFromInterfacesHandler.java.orig
+++ /dev/null
@@ -1,79 +0,0 @@
-package de.tu_bs.cs.isf.commands.toolbar.handler;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-<<<<<<< HEAD
-import org.eclipse.core.resources.IProject;
-=======
-<<<<<<<< HEAD:de.tu_bs.cs.isf.commands.toolbar/src/de/tu_bs/cs/isf/commands/toolbar/handler/GenerateDiagramsFromClassHandler.java
-import org.eclipse.jdt.internal.core.CompilationUnit;
-========
-import org.eclipse.core.resources.IProject;
->>>>>>>> master:de.tu_bs.cs.isf.commands.toolbar/src/de/tu_bs/cs/isf/commands/toolbar/handler/GenerateClassesFromInterfacesHandler.java
->>>>>>> master
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.handlers.HandlerUtil;
-
-<<<<<<< HEAD
-import de.tu_bs.cs.isf.cbc.tool.helper.GenerateClassFromInterfaces;
-
-public class GenerateClassesFromInterfacesHandler extends AbstractHandler {
-=======
-<<<<<<<< HEAD:de.tu_bs.cs.isf.commands.toolbar/src/de/tu_bs/cs/isf/commands/toolbar/handler/GenerateDiagramsFromClassHandler.java
-import de.tu_bs.cs.isf.cbc.tool.helper.GenerateModelFromCode;
-
-public class GenerateDiagramsFromClassHandler extends AbstractHandler {
-========
-import de.tu_bs.cs.isf.cbc.util.GenerateClassFromInterfaces;
-
-public class GenerateClassesFromInterfacesHandler extends AbstractHandler {
->>>>>>>> master:de.tu_bs.cs.isf.commands.toolbar/src/de/tu_bs/cs/isf/commands/toolbar/handler/GenerateClassesFromInterfacesHandler.java
->>>>>>> master
-
-	@Override
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		ISelection selection = HandlerUtil.getActiveWorkbenchWindow(event).getActivePage().getSelection();
-		if (selection != null & selection instanceof IStructuredSelection) {
-			IStructuredSelection strucSelection = (IStructuredSelection) selection;
-			if (strucSelection.size() != 1) {
-<<<<<<< HEAD
-=======
-<<<<<<<< HEAD:de.tu_bs.cs.isf.commands.toolbar/src/de/tu_bs/cs/isf/commands/toolbar/handler/GenerateDiagramsFromClassHandler.java
-				throw new ExecutionException("Select only one file.");
-			}
-			CompilationUnit u = (CompilationUnit) strucSelection.getFirstElement();
-			IFile file = (IFile) u.getResource();
-
-			final String PARM_MSG = "de.tu_bs.cs.isf.commands.toolbar.msg";
-			String msg = event.getParameter(PARM_MSG);
-
-			GenerateModelFromCode gmfc = new GenerateModelFromCode();
-			gmfc.execute(file);
-========
->>>>>>> master
-				throw new ExecutionException("Select only one file/project.");
-			}
-			GenerateClassFromInterfaces gen = new GenerateClassFromInterfaces();
-			if (strucSelection.getFirstElement() instanceof IProject) {
-				IProject project = (IProject) strucSelection.getFirstElement();
-				gen.execute(project);
-			} else if (strucSelection.getFirstElement() instanceof IFile) {
-				IFile file = (IFile) strucSelection.getFirstElement();
-				gen.execute(file);
-			}		
-<<<<<<< HEAD
-		}
-		return null;
-	}
-=======
->>>>>>>> master:de.tu_bs.cs.isf.commands.toolbar/src/de/tu_bs/cs/isf/commands/toolbar/handler/GenerateClassesFromInterfacesHandler.java
-		}
-		return null;
-	}
-	
->>>>>>> master
-
-}
diff --git a/de.tu_bs.cs.isf.commands.toolbar/src/de/tu_bs/cs/isf/commands/toolbar/handler/GenerateDiagramsFromClassHandler.java.orig b/de.tu_bs.cs.isf.commands.toolbar/src/de/tu_bs/cs/isf/commands/toolbar/handler/GenerateDiagramsFromClassHandler.java.orig
deleted file mode 100644
index ff365aae0..000000000
--- a/de.tu_bs.cs.isf.commands.toolbar/src/de/tu_bs/cs/isf/commands/toolbar/handler/GenerateDiagramsFromClassHandler.java.orig
+++ /dev/null
@@ -1,91 +0,0 @@
-package de.tu_bs.cs.isf.commands.toolbar.handler;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-<<<<<<< HEAD
-import org.eclipse.core.resources.IFile;
-<<<<<<<< HEAD:de.tu_bs.cs.isf.commands.toolbar/src/de/tu_bs/cs/isf/commands/toolbar/handler/GenerateDiagramsFromClassHandler.java
-import org.eclipse.jdt.internal.core.CompilationUnit;
-========
-import org.eclipse.core.resources.IProject;
->>>>>>>> master:de.tu_bs.cs.isf.commands.toolbar/src/de/tu_bs/cs/isf/commands/toolbar/handler/GenerateClassesFromInterfacesHandler.java
-=======
-import org.eclipse.core.internal.resources.File;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
->>>>>>> master
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.handlers.HandlerUtil;
-
-<<<<<<< HEAD
-<<<<<<<< HEAD:de.tu_bs.cs.isf.commands.toolbar/src/de/tu_bs/cs/isf/commands/toolbar/handler/GenerateDiagramsFromClassHandler.java
-import de.tu_bs.cs.isf.cbc.tool.helper.GenerateModelFromCode;
-
-public class GenerateDiagramsFromClassHandler extends AbstractHandler {
-========
-import de.tu_bs.cs.isf.cbc.util.GenerateClassFromInterfaces;
-
-public class GenerateClassesFromInterfacesHandler extends AbstractHandler {
->>>>>>>> master:de.tu_bs.cs.isf.commands.toolbar/src/de/tu_bs/cs/isf/commands/toolbar/handler/GenerateClassesFromInterfacesHandler.java
-=======
-import de.tu_bs.cs.isf.cbc.util.GenerateModelFromCode;
-
-public class GenerateDiagramsFromClassHandler extends AbstractHandler {
->>>>>>> master
-
-	@Override
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		ISelection selection = HandlerUtil.getActiveWorkbenchWindow(event).getActivePage().getSelection();
-		if (selection != null & selection instanceof IStructuredSelection) {
-			IStructuredSelection strucSelection = (IStructuredSelection) selection;
-			if (strucSelection.size() != 1) {
-<<<<<<< HEAD
-<<<<<<<< HEAD:de.tu_bs.cs.isf.commands.toolbar/src/de/tu_bs/cs/isf/commands/toolbar/handler/GenerateDiagramsFromClassHandler.java
-				throw new ExecutionException("Select only one file.");
-			}
-			CompilationUnit u = (CompilationUnit) strucSelection.getFirstElement();
-			IFile file = (IFile) u.getResource();
-
-			final String PARM_MSG = "de.tu_bs.cs.isf.commands.toolbar.msg";
-			String msg = event.getParameter(PARM_MSG);
-
-			GenerateModelFromCode gmfc = new GenerateModelFromCode();
-			gmfc.execute(file);
-========
-				throw new ExecutionException("Select only one file/project.");
-			}
-			GenerateClassFromInterfaces gen = new GenerateClassFromInterfaces();
-			if (strucSelection.getFirstElement() instanceof IProject) {
-				IProject project = (IProject) strucSelection.getFirstElement();
-				gen.execute(project);
-			} else if (strucSelection.getFirstElement() instanceof IFile) {
-				IFile file = (IFile) strucSelection.getFirstElement();
-				gen.execute(file);
-			}		
->>>>>>>> master:de.tu_bs.cs.isf.commands.toolbar/src/de/tu_bs/cs/isf/commands/toolbar/handler/GenerateClassesFromInterfacesHandler.java
-		}
-		return null;
-	}
-	
-
-}
-=======
-				throw new ExecutionException("Select only one file.");
-			}
-			
-			IResource res = ((File) strucSelection.getFirstElement());
-			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(res.getFullPath());
-
-			final String PARM_MSG = "de.tu_bs.cs.isf.commands.toolbar.msg";
-			String msg = event.getParameter(PARM_MSG);
-			
-			GenerateModelFromCode gmfc = new GenerateModelFromCode();
-			gmfc.execute(file);
-		}
-		return null;
-	}
-}
->>>>>>> master
diff --git a/de.tu_bs.cs.isf.commands.toolbar/src/de/tu_bs/cs/isf/commands/toolbar/handler/GenerateHandler.java.orig b/de.tu_bs.cs.isf.commands.toolbar/src/de/tu_bs/cs/isf/commands/toolbar/handler/GenerateHandler.java.orig
deleted file mode 100644
index 78d18a6bb..000000000
--- a/de.tu_bs.cs.isf.commands.toolbar/src/de/tu_bs/cs/isf/commands/toolbar/handler/GenerateHandler.java.orig
+++ /dev/null
@@ -1,86 +0,0 @@
-package de.tu_bs.cs.isf.commands.toolbar.handler;
-
-import java.io.IOException;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.handlers.HandlerUtil;
-
-import de.tu_bs.cs.isf.cbc.cbcmodel.CbCFormula;
-import de.tu_bs.cs.isf.cbc.cbcmodel.CbCProblem;
-import de.tu_bs.cs.isf.cbc.cbcmodel.CbcmodelPackage;
-<<<<<<< HEAD
-import de.tu_bs.cs.isf.cbc.tool.helper.GenerateDiagramFromModel;
-=======
-import de.tu_bs.cs.isf.cbc.util.GenerateDiagramFromModel;
->>>>>>> master
-
-public class GenerateHandler extends AbstractHandler implements IHandler {
-
-	@Override
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		ISelection selection = HandlerUtil.getActiveWorkbenchWindow(event).getActivePage().getSelection();
-		if (selection != null & selection instanceof IStructuredSelection) {
-			IStructuredSelection strucSelection = (IStructuredSelection) selection;
-			List<IFile> fileList = strucSelection.toList();
-			if (fileList.size() != 1) {
-				throw new ExecutionException("Select only one File.");
-			}
-			IFile iFile = fileList.get(0);
-			if (!iFile.getFileExtension().equals("cbcmodel")) {
-				throw new ExecutionException("Select exactly one cbcmodel which should be transformed.");
-			}
-			
-			CbcmodelPackage.eINSTANCE.eClass();
-			Resource.Factory.Registry reg = Resource.Factory.Registry.INSTANCE;
-			Map<String, Object> m = reg.getExtensionToFactoryMap();
-			m.put("cbcmodel", new XMIResourceFactoryImpl());
-			
-			ResourceSet rs = new ResourceSetImpl();
-			URI uri = URI.createFileURI(iFile.getLocation().toPortableString());
-			Resource oldResource = rs.getResource(uri, true);
-			CbCProblem problem = (CbCProblem) oldResource.getContents().get(0);
-			CbCFormula formula = TraverseFormulaAndTransform.traverseFormulaAndTransform(problem.getCbcformula());
-			problem.setCbcformula(formula);
-			
-			uri = uri.trimFileExtension();
-			String lastSegment =  uri.segment(uri.segmentCount() - 1);
-			uri = uri.trimSegments(1);
-			uri = uri.appendSegment(lastSegment + "Graphical");
-			uri = uri.appendFileExtension("cbcmodel");
-			Resource newResource = rs.createResource(uri);
-			newResource.getContents().add(formula);
-			if (problem.getJavaVariable() != null)
-				newResource.getContents().add(problem.getJavaVariable());
-			if (problem.getGlobalcondition() != null)
-			newResource.getContents().add(problem.getGlobalcondition());
-			if (problem.getRenaming() != null)
-			newResource.getContents().add(problem.getRenaming());
-			
-			GenerateDiagramFromModel generator = new GenerateDiagramFromModel();
-			generator.execute(newResource);
-			
-			try {
-				newResource.save(Collections.EMPTY_MAP);
-				newResource.setTrackingModification(true);
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-		}
-		return null;
-	}
-
-}
diff --git a/de.tu_bs.cs.isf.commands.toolbar/src/de/tu_bs/cs/isf/commands/toolbar/handler/GenerateJavaCodeHandler.java.orig b/de.tu_bs.cs.isf.commands.toolbar/src/de/tu_bs/cs/isf/commands/toolbar/handler/GenerateJavaCodeHandler.java.orig
deleted file mode 100644
index c7725afa9..000000000
--- a/de.tu_bs.cs.isf.commands.toolbar/src/de/tu_bs/cs/isf/commands/toolbar/handler/GenerateJavaCodeHandler.java.orig
+++ /dev/null
@@ -1,168 +0,0 @@
-package de.tu_bs.cs.isf.commands.toolbar.handler;
-
-<<<<<<< HEAD
-=======
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
->>>>>>> master
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-<<<<<<< HEAD
-import org.eclipse.jdt.internal.core.CompilationUnit;
-=======
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
->>>>>>> master
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.handlers.HandlerUtil;
-
-<<<<<<< HEAD
-import de.tu_bs.cs.isf.cbc.tool.helper.GenerateCodeFromModel;
-import de.tu_bs.cs.isf.cbc.tool.helper.GenerateModelFromCode;
-=======
-import de.tu_bs.cs.isf.cbc.cbcclass.Field;
-import de.tu_bs.cs.isf.cbc.cbcmodel.CbCFormula;
-import de.tu_bs.cs.isf.cbc.cbcmodel.CbcmodelPackage;
-import de.tu_bs.cs.isf.cbc.cbcmodel.GlobalConditions;
-import de.tu_bs.cs.isf.cbc.cbcmodel.JavaVariable;
-import de.tu_bs.cs.isf.cbc.cbcmodel.JavaVariables;
-import de.tu_bs.cs.isf.cbc.cbcmodel.Renaming;
-import de.tu_bs.cs.isf.cbc.cbcmodel.VariableKind;
-import de.tu_bs.cs.isf.cbc.util.Console;
-import de.tu_bs.cs.isf.cbc.util.ConstructCodeBlock;
-import de.tu_bs.cs.isf.cbc.util.FileUtil;
->>>>>>> master
-
-public class GenerateJavaCodeHandler extends AbstractHandler {
-
-	@Override
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-<<<<<<< HEAD
-		
-		System.out.println("Todo: Aktuelle Trigger über Kontextmenü im Diagram");
-		return null;
-	}
-
-=======
-		ISelection selection = HandlerUtil.getActiveWorkbenchWindow(event).getActivePage().getSelection();
-		if (selection != null & selection instanceof IStructuredSelection) {
-			IStructuredSelection strucSelection = (IStructuredSelection) selection;
-			List<IFile> fileList = strucSelection.toList();
-			if (fileList.size() != 1) {
-				throw new ExecutionException("Select only one File.");
-			}
-			IFile iFile = fileList.get(0);
-			if (!iFile.getFileExtension().equals("cbcmodel") && !iFile.getFileExtension().equals("diagram")) {
-				throw new ExecutionException("Select exactly one cbcmodel or diagram which should be transformed.");
-			}
-			
-			Resource res = null;
-			ResourceSet rs = new ResourceSetImpl();
-			URI uri = null;
-			if (iFile.getFileExtension().equals("diagram")) {
-				uri = rs.getURIConverter().normalize(URI.createFileURI(iFile.getLocation().toPortableString().replace(".diagram", ".cbcmodel")));
-			} else {
-				uri = URI.createFileURI(iFile.getLocation().toPortableString());
-			}
-			res = rs.getResource(uri, true);
-			CbCFormula formula = (CbCFormula) res.getContents().get(0);
-			JavaVariables vars = (JavaVariables) res.getContents().get(1);
-					
-			String signatureString = formula.getMethodObj() != null ? formula.getMethodObj().getSignature() : ("public void " + formula.getName().toLowerCase() + " ()");
-		
-			JavaVariable returnVariable = null;
-			int counter = 0;
-			LinkedList<String> localVariables = new LinkedList<String>();
-			for(int i = 0; i < vars.getVariables().size(); i++) {
-				JavaVariable currentVariable = vars.getVariables().get(i);
-				if (currentVariable.getKind() == VariableKind.RETURN) {
-					counter++;
-					if (!signatureString.substring(0, signatureString.indexOf('(')).contains(currentVariable.getName().replace("non-null", "").trim().split(" ")[0])) {
-						Console.println("Method return type and variable type does not match.");
-						return null;
-					}
-					if (counter > 1) {
-						Console.println("Too much variables of kind RETURN.");
-						return null;
-					}
-					returnVariable = currentVariable;
-				} else if	(currentVariable.getKind() == VariableKind.LOCAL) {
-					localVariables.add(currentVariable.getName().replace("non-null", ""));
-				}
-			}
-			String globalVariables ="";
-			for (Field field : vars.getFields()) {
-				globalVariables += ("\t" + field.getVisibility().getName().toLowerCase() + " /*@spec_public@*/ " + field.getType() + " " + field.getName().replace("non-null ", "") + ";\n");
-			}
-		
-			String location = uri.toString().replace("file:/", "");
-			if (location.contains("/features/")) 
-				location = location.substring(0, location.indexOf("/features/"));
-			else 
-				location = location.substring(0, location.indexOf("/src/"));
-			location += "/code-gen" + File.separator + (formula.getClassName().equals("") ? ("Class" + formula.getName()) : formula.getClassName()) + ".java";
-			String code = ConstructCodeBlock.constructCodeBlockForExport(formula, null, null, localVariables, returnVariable, signatureString);
-			writeFile(location, code, formula.getMethodObj() != null ? formula.getMethodObj().getParentClass().getPackage() : "", formula.getClassName().equals("") ? ("Class" + formula.getName()) : formula.getClassName(), signatureString, globalVariables);
-		}
-		return null;
-	}
-
-	private void writeFile(String location, String code, String packageName, String className,  String signature, String globalVariables) {
-		StringBuffer newCode = new StringBuffer();
-		newCode.setLength(0);
-		File javaFile = new File(location);
-		try {
-			if (!javaFile.exists()) {
-				javaFile.getParentFile().mkdirs();
-				javaFile.createNewFile();
-			} else {
-				newCode = ConstructCodeBlock.editCodeBlockForExport(code, javaFile, signature, globalVariables);
-			}
-			FileWriter fw = new FileWriter(javaFile);
-			BufferedWriter bw = new BufferedWriter(fw);
-
-			if(newCode.length() == 0) {
-				if (packageName != null && !packageName.isEmpty()) {
-					bw.write("package " + packageName + "\n\n");
-				}
-				if(globalVariables.isEmpty())
-					bw.write("public class " + className + " {\n\n" + code + "\n}"); 
-				else {
-					bw.write("public class " + className + " {\n\n" + globalVariables + "\n" + code + "\n}");
-				}
-			}
-			else {
-				newCode.append("\n}");
-				bw.write(newCode.toString());
-			}
-			
-			bw.close();
-			IWorkspace workspace = ResourcesPlugin.getWorkspace();
-			IPath iLocation = Path.fromOSString(javaFile.getAbsolutePath());
-			IFile ifile = workspace.getRoot().getFileForLocation(iLocation);
-			ifile.refreshLocal(0, null);
-		} catch (IOException e) {
-			e.printStackTrace();
-		} catch (CoreException e) {
-			e.printStackTrace();
-		}
-	}	
->>>>>>> master
-}
diff --git a/de.tu_bs.cs.isf.commands.toolbar/src/de/tu_bs/cs/isf/commands/toolbar/handler/GenerateModelAndDiagramHandler.java.orig b/de.tu_bs.cs.isf.commands.toolbar/src/de/tu_bs/cs/isf/commands/toolbar/handler/GenerateModelAndDiagramHandler.java.orig
deleted file mode 100644
index 8a63602ec..000000000
--- a/de.tu_bs.cs.isf.commands.toolbar/src/de/tu_bs/cs/isf/commands/toolbar/handler/GenerateModelAndDiagramHandler.java.orig
+++ /dev/null
@@ -1,60 +0,0 @@
-package de.tu_bs.cs.isf.commands.toolbar.handler;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.IHandler;
-<<<<<<< HEAD
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jdt.internal.core.CompilationUnit;
-=======
-import org.eclipse.core.internal.resources.File;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
->>>>>>> master
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.handlers.HandlerUtil;
-
-<<<<<<< HEAD
-import de.tu_bs.cs.isf.cbc.tool.helper.GenerateModelFromCode;
-import de.tu_bs.cs.isf.cbc.tool.helper.GenerateModelWithoutContract;
-=======
-import de.tu_bs.cs.isf.cbc.util.GenerateModelFromCode;
-import de.tu_bs.cs.isf.cbc.util.GenerateModelWithoutContract;
->>>>>>> master
-
-public class GenerateModelAndDiagramHandler extends AbstractHandler implements IHandler {
-
-	@Override
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		ISelection selection = HandlerUtil.getActiveWorkbenchWindow(event).getActivePage().getSelection();
-		if (selection != null & selection instanceof IStructuredSelection) {
-			IStructuredSelection strucSelection = (IStructuredSelection) selection;
-			if (strucSelection.size() != 1) {
-				throw new ExecutionException("Select only one file.");
-			}
-<<<<<<< HEAD
-			CompilationUnit u = (CompilationUnit) strucSelection.getFirstElement();
-			IFile file = (IFile) u.getResource();
-=======
-			IResource res = ((File) strucSelection.getFirstElement());
-			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(res.getFullPath());
->>>>>>> master
-
-			final String PARM_MSG = "de.tu_bs.cs.isf.commands.toolbar.msg";
-			String msg = event.getParameter(PARM_MSG);
-
-			if (msg.equals("Contract")) {
-				GenerateModelFromCode gmfc = new GenerateModelFromCode();
-				gmfc.execute(file);
-			} else if (msg.equals("NoContract")) {
-				GenerateModelWithoutContract gmwc = new GenerateModelWithoutContract();
-				gmwc.execute(file);
-			}
-		}
-		return null;
-	}
-
-}
diff --git a/de.tu_bs.cs.isf.commands.toolbar/src/de/tu_bs/cs/isf/commands/toolbar/handler/VerifyThread.java.orig b/de.tu_bs.cs.isf.commands.toolbar/src/de/tu_bs/cs/isf/commands/toolbar/handler/VerifyThread.java.orig
deleted file mode 100644
index 994dfeffb..000000000
--- a/de.tu_bs.cs.isf.commands.toolbar/src/de/tu_bs/cs/isf/commands/toolbar/handler/VerifyThread.java.orig
+++ /dev/null
@@ -1,36 +0,0 @@
-package de.tu_bs.cs.isf.commands.toolbar.handler;
-
-import java.io.File;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-
-import de.tu_bs.cs.isf.cbc.util.ProveWithKey;
-
-public class VerifyThread extends Thread {
-
-	List<IFile> fileList;
-	
-	public VerifyThread(List<IFile> fileList) {
-		super();
-		this.fileList = fileList;
-	}
-	
-	@Override
-	public void run() {
-		for (IFile iFile : fileList) {
-			File file = iFile.getLocation().toFile();
-<<<<<<< HEAD
-			ProveWithKey.proveWithKey(file, null, false, null, null, null, null);
-			}
-=======
-			try {
-				ProveWithKey.proveWithKey(file, null, false, null, null, null, null);
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-		}
->>>>>>> master
-    }
-
-}
diff --git a/de.tu_bs.cs.isf.commands.toolbar/src/de/tu_bs/cs/isf/commands/toolbar/handler/VerifyWithKeYHandler.java.orig b/de.tu_bs.cs.isf.commands.toolbar/src/de/tu_bs/cs/isf/commands/toolbar/handler/VerifyWithKeYHandler.java.orig
deleted file mode 100644
index 567612740..000000000
--- a/de.tu_bs.cs.isf.commands.toolbar/src/de/tu_bs/cs/isf/commands/toolbar/handler/VerifyWithKeYHandler.java.orig
+++ /dev/null
@@ -1,59 +0,0 @@
-package de.tu_bs.cs.isf.commands.toolbar.handler;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.StandardCopyOption;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-
-import de.tu_bs.cs.isf.cbc.util.KeYInteraction;
-<<<<<<< HEAD
-import de.tu_bs.cs.isf.cbc.util.ProveWithKey;
-=======
->>>>>>> master
-
-public class VerifyWithKeYHandler extends AbstractHandler implements IHandler {
-
-	private static int counter = 0;
-	
-	@Override
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		IWorkspace workspace = ResourcesPlugin.getWorkspace();
-		IProject project = null;
-		for (IProject p : ResourcesPlugin.getWorkspace().getRoot().getProjects()) {
-			if (p.getName().contains("Userstudy")) {
-				project = p;
-			}
-		}
-		if (project != null) {
-			String location = project.getLocation() + "/src/";
-			File javaFile = new File(location + "FirstExercise.java");
-			if (!javaFile.exists()) {
-				javaFile = new File(location + "SecondExercise.java");
-			}
-			try {
-				File javaFileCopy = new File(location + "saved/Ex" + counter +  ".txt");
-				Files.copy(javaFile.toPath(), javaFileCopy.toPath(), StandardCopyOption.REPLACE_EXISTING);  
-				IPath iLocation = Path.fromOSString(javaFileCopy.getAbsolutePath()); 
-				IFile ifile = workspace.getRoot().getFileForLocation(iLocation);
-				ifile.refreshLocal(0, null);
-				KeYInteraction.startKeYProofFirstContract(javaFile, counter);
-				counter++;
-			} catch (IOException | CoreException e1) {
-				e1.printStackTrace();
-			}
-		}
-		return null;
-	}
-}
diff --git a/de.tu_bs.cs.isf.lattice/.project.orig b/de.tu_bs.cs.isf.lattice/.project.orig
deleted file mode 100644
index 56cf62282..000000000
--- a/de.tu_bs.cs.isf.lattice/.project.orig
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>de.tu_bs.cs.isf.lattice</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/de.tu_bs.cs.isf.lattice/build.properties.orig b/de.tu_bs.cs.isf.lattice/build.properties.orig
deleted file mode 100644
index 6b4ffb6ca..000000000
--- a/de.tu_bs.cs.isf.lattice/build.properties.orig
+++ /dev/null
@@ -1,6 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               lib/digraph-parser-1.0.jar,\
-               plugin.xml