diff --git a/.DS_Store b/.DS_Store
index 22b35c76f..c60448a7a 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/.project b/.project
new file mode 100644
index 000000000..9f1eb2b8d
--- /dev/null
+++ b/.project
@@ -0,0 +1,11 @@
+
+
+ CorC
+
+
+
+
+
+
+
+
diff --git a/de.tu-bs.cs.isf.cbc.model/.DS_Store b/de.tu-bs.cs.isf.cbc.model/.DS_Store
index 09eb5aeea..07e277c96 100644
Binary files a/de.tu-bs.cs.isf.cbc.model/.DS_Store and b/de.tu-bs.cs.isf.cbc.model/.DS_Store differ
diff --git a/de.tu-bs.cs.isf.cbc.model/pom.xml b/de.tu-bs.cs.isf.cbc.model/pom.xml
index e33687838..157328085 100644
--- a/de.tu-bs.cs.isf.cbc.model/pom.xml
+++ b/de.tu-bs.cs.isf.cbc.model/pom.xml
@@ -58,14 +58,15 @@
maven-clean-plugin
3.1.0
-
-
- ${project.basedir}/src-gen/
-
- **/*
-
-
-
+
+
+ ${project.basedir}/src-gen/
+
+ **/MethodImpl.java
+ **/JavaVariablesImpl.java
+
+
+
diff --git a/de.tu-bs.cs.isf.cbc.model/src-gen/de/tu_bs/cs/isf/cbc/cbcclass/impl/MethodImpl.java b/de.tu-bs.cs.isf.cbc.model/src-gen/de/tu_bs/cs/isf/cbc/cbcclass/impl/MethodImpl.java
new file mode 100644
index 000000000..63ae72b32
--- /dev/null
+++ b/de.tu-bs.cs.isf.cbc.model/src-gen/de/tu_bs/cs/isf/cbc/cbcclass/impl/MethodImpl.java
@@ -0,0 +1,871 @@
+/**
+ */
+package de.tu_bs.cs.isf.cbc.cbcclass.impl;
+
+import de.tu_bs.cs.isf.cbc.cbcclass.CbcclassPackage;
+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.cbcclass.Visibility;
+
+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.Condition;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+/**
+ *
+ * An implementation of the model object 'Method'.
+ *
+ *
+ * The following features are implemented:
+ *
+ *
+ * - {@link de.tu_bs.cs.isf.cbc.cbcclass.impl.MethodImpl#getCbcDiagramURI Cbc Diagram URI}
+ * - {@link de.tu_bs.cs.isf.cbc.cbcclass.impl.MethodImpl#getName Name}
+ * - {@link de.tu_bs.cs.isf.cbc.cbcclass.impl.MethodImpl#getAssignable Assignable}
+ * - {@link de.tu_bs.cs.isf.cbc.cbcclass.impl.MethodImpl#getCbcStartTriple Cbc Start Triple}
+ * - {@link de.tu_bs.cs.isf.cbc.cbcclass.impl.MethodImpl#getParentClass Parent Class}
+ * - {@link de.tu_bs.cs.isf.cbc.cbcclass.impl.MethodImpl#getPrecondition Precondition}
+ * - {@link de.tu_bs.cs.isf.cbc.cbcclass.impl.MethodImpl#getPostcondition Postcondition}
+ * - {@link de.tu_bs.cs.isf.cbc.cbcclass.impl.MethodImpl#getReturnType Return Type}
+ * - {@link de.tu_bs.cs.isf.cbc.cbcclass.impl.MethodImpl#getParameters Parameters}
+ * - {@link de.tu_bs.cs.isf.cbc.cbcclass.impl.MethodImpl#getVisibility Visibility}
+ * - {@link de.tu_bs.cs.isf.cbc.cbcclass.impl.MethodImpl#getSignature Signature}
+ * - {@link de.tu_bs.cs.isf.cbc.cbcclass.impl.MethodImpl#isIsStatic Is Static}
+ *
+ *
+ * @generated
+ */
+public class MethodImpl extends MinimalEObjectImpl.Container implements Method
+{
+ /**
+ * The default value of the '{@link #getCbcDiagramURI() Cbc Diagram URI}' attribute.
+ *
+ *
+ * @see #getCbcDiagramURI()
+ * @generated
+ * @ordered
+ */
+ protected static final String CBC_DIAGRAM_URI_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getCbcDiagramURI() Cbc Diagram URI}' attribute.
+ *
+ *
+ * @see #getCbcDiagramURI()
+ * @generated
+ * @ordered
+ */
+ protected String cbcDiagramURI = CBC_DIAGRAM_URI_EDEFAULT;
+
+ /**
+ * The default value of the '{@link #getName() Name}' attribute.
+ *
+ *
+ * @see #getName()
+ * @generated
+ * @ordered
+ */
+ protected static final String NAME_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getName() Name}' attribute.
+ *
+ *
+ * @see #getName()
+ * @generated
+ * @ordered
+ */
+ protected String name = NAME_EDEFAULT;
+
+ /**
+ * The default value of the '{@link #getAssignable() Assignable}' attribute.
+ *
+ *
+ * @see #getAssignable()
+ * @generated
+ * @ordered
+ */
+ protected static final String ASSIGNABLE_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getAssignable() Assignable}' attribute.
+ *
+ *
+ * @see #getAssignable()
+ * @generated
+ * @ordered
+ */
+ protected String assignable = ASSIGNABLE_EDEFAULT;
+
+ /**
+ * The cached value of the '{@link #getCbcStartTriple() Cbc Start Triple}' reference.
+ *
+ *
+ * @see #getCbcStartTriple()
+ * @generated
+ * @ordered
+ */
+ protected CbCFormula cbcStartTriple;
+
+ /**
+ * The default value of the '{@link #getReturnType() Return Type}' attribute.
+ *
+ *
+ * @see #getReturnType()
+ * @generated
+ * @ordered
+ */
+ protected static final String RETURN_TYPE_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getReturnType() Return Type}' attribute.
+ *
+ *
+ * @see #getReturnType()
+ * @generated
+ * @ordered
+ */
+ protected String returnType = RETURN_TYPE_EDEFAULT;
+
+ /**
+ * The cached value of the '{@link #getParameters() Parameters}' containment reference list.
+ *
+ *
+ * @see #getParameters()
+ * @generated
+ * @ordered
+ */
+ protected EList parameters;
+
+ /**
+ * The default value of the '{@link #getVisibility() Visibility}' attribute.
+ *
+ *
+ * @see #getVisibility()
+ * @generated
+ * @ordered
+ */
+ protected static final Visibility VISIBILITY_EDEFAULT = Visibility.PUBLIC;
+
+ /**
+ * The cached value of the '{@link #getVisibility() Visibility}' attribute.
+ *
+ *
+ * @see #getVisibility()
+ * @generated
+ * @ordered
+ */
+ protected Visibility visibility = VISIBILITY_EDEFAULT;
+
+ /**
+ * The default value of the '{@link #getSignature() Signature}' attribute.
+ *
+ *
+ * @see #getSignature()
+ * @generated
+ * @ordered
+ */
+ protected static final String SIGNATURE_EDEFAULT = null;
+
+ /**
+ * The default value of the '{@link #isIsStatic() Is Static}' attribute.
+ *
+ *
+ * @see #isIsStatic()
+ * @generated
+ * @ordered
+ */
+ protected static final boolean IS_STATIC_EDEFAULT = false;
+
+ /**
+ * The cached value of the '{@link #isIsStatic() Is Static}' attribute.
+ *
+ *
+ * @see #isIsStatic()
+ * @generated
+ * @ordered
+ */
+ protected boolean isStatic = IS_STATIC_EDEFAULT;
+
+ /**
+ *
+ *
+ * @generated
+ */
+ protected MethodImpl()
+ {
+ super();
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass()
+ {
+ return CbcclassPackage.Literals.METHOD;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public String getCbcDiagramURI()
+ {
+ return cbcDiagramURI;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public void setCbcDiagramURI(String newCbcDiagramURI)
+ {
+ String oldCbcDiagramURI = cbcDiagramURI;
+ cbcDiagramURI = newCbcDiagramURI;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, CbcclassPackage.METHOD__CBC_DIAGRAM_URI, oldCbcDiagramURI, cbcDiagramURI));
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public String getName()
+ {
+ return name;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public void setName(String newName)
+ {
+ String oldName = name;
+ name = newName;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, CbcclassPackage.METHOD__NAME, oldName, name));
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public String getAssignable()
+ {
+ return assignable;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public void setAssignable(String newAssignable)
+ {
+ String oldAssignable = assignable;
+ assignable = newAssignable;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, CbcclassPackage.METHOD__ASSIGNABLE, oldAssignable, assignable));
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public CbCFormula getCbcStartTriple()
+ {
+ if (cbcStartTriple != null && cbcStartTriple.eIsProxy())
+ {
+ InternalEObject oldCbcStartTriple = (InternalEObject)cbcStartTriple;
+ cbcStartTriple = (CbCFormula)eResolveProxy(oldCbcStartTriple);
+ if (cbcStartTriple != oldCbcStartTriple)
+ {
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, CbcclassPackage.METHOD__CBC_START_TRIPLE, oldCbcStartTriple, cbcStartTriple));
+ }
+ }
+ return cbcStartTriple;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public CbCFormula basicGetCbcStartTriple()
+ {
+ return cbcStartTriple;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public NotificationChain basicSetCbcStartTriple(CbCFormula newCbcStartTriple, NotificationChain msgs)
+ {
+ CbCFormula oldCbcStartTriple = cbcStartTriple;
+ cbcStartTriple = newCbcStartTriple;
+ if (eNotificationRequired())
+ {
+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CbcclassPackage.METHOD__CBC_START_TRIPLE, oldCbcStartTriple, newCbcStartTriple);
+ if (msgs == null) msgs = notification; else msgs.add(notification);
+ }
+ return msgs;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public void setCbcStartTriple(CbCFormula newCbcStartTriple)
+ {
+ if (newCbcStartTriple != cbcStartTriple)
+ {
+ NotificationChain msgs = null;
+ if (cbcStartTriple != null)
+ msgs = ((InternalEObject)cbcStartTriple).eInverseRemove(this, CbcmodelPackage.CB_CFORMULA__METHOD_OBJ, CbCFormula.class, msgs);
+ if (newCbcStartTriple != null)
+ msgs = ((InternalEObject)newCbcStartTriple).eInverseAdd(this, CbcmodelPackage.CB_CFORMULA__METHOD_OBJ, CbCFormula.class, msgs);
+ msgs = basicSetCbcStartTriple(newCbcStartTriple, msgs);
+ if (msgs != null) msgs.dispatch();
+ }
+ else if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, CbcclassPackage.METHOD__CBC_START_TRIPLE, newCbcStartTriple, newCbcStartTriple));
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public ModelClass getParentClass()
+ {
+ if (eContainerFeatureID() != CbcclassPackage.METHOD__PARENT_CLASS) return null;
+ return (ModelClass)eInternalContainer();
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public NotificationChain basicSetParentClass(ModelClass newParentClass, NotificationChain msgs)
+ {
+ msgs = eBasicSetContainer((InternalEObject)newParentClass, CbcclassPackage.METHOD__PARENT_CLASS, msgs);
+ return msgs;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public void setParentClass(ModelClass newParentClass)
+ {
+ if (newParentClass != eInternalContainer() || (eContainerFeatureID() != CbcclassPackage.METHOD__PARENT_CLASS && newParentClass != null))
+ {
+ if (EcoreUtil.isAncestor(this, newParentClass))
+ throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+ NotificationChain msgs = null;
+ if (eInternalContainer() != null)
+ msgs = eBasicRemoveFromContainer(msgs);
+ if (newParentClass != null)
+ msgs = ((InternalEObject)newParentClass).eInverseAdd(this, CbcclassPackage.MODEL_CLASS__METHODS, ModelClass.class, msgs);
+ msgs = basicSetParentClass(newParentClass, msgs);
+ if (msgs != null) msgs.dispatch();
+ }
+ else if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, CbcclassPackage.METHOD__PARENT_CLASS, newParentClass, newParentClass));
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public Condition getPrecondition()
+ {
+ Condition precondition = basicGetPrecondition();
+ return precondition != null && precondition.eIsProxy() ? (Condition)eResolveProxy((InternalEObject)precondition) : precondition;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public Condition basicGetPrecondition()
+ {
+ return cbcStartTriple.getStatement().getPreCondition();
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public void setPrecondition(Condition newPrecondition)
+ {
+ // TODO: implement this method to set the 'Precondition' reference
+ // Ensure that you remove @generated or mark it @generated NOT
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public Condition getPostcondition()
+ {
+ Condition postcondition = basicGetPostcondition();
+ return postcondition != null && postcondition.eIsProxy() ? (Condition)eResolveProxy((InternalEObject)postcondition) : postcondition;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public Condition basicGetPostcondition()
+ {
+ return cbcStartTriple.getStatement().getPostCondition();
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public void setPostcondition(Condition newPostcondition)
+ {
+ // TODO: implement this method to set the 'Postcondition' reference
+ // Ensure that you remove @generated or mark it @generated NOT
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public String getReturnType()
+ {
+ return returnType;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public void setReturnType(String newReturnType)
+ {
+ String oldReturnType = returnType;
+ returnType = newReturnType;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, CbcclassPackage.METHOD__RETURN_TYPE, oldReturnType, returnType));
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public EList getParameters()
+ {
+ if (parameters == null)
+ {
+ parameters = new EObjectContainmentEList(Parameter.class, this, CbcclassPackage.METHOD__PARAMETERS);
+ }
+ return parameters;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public Visibility getVisibility()
+ {
+ return visibility;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public void setVisibility(Visibility newVisibility)
+ {
+ Visibility oldVisibility = visibility;
+ visibility = newVisibility == null ? VISIBILITY_EDEFAULT : newVisibility;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, CbcclassPackage.METHOD__VISIBILITY, oldVisibility, visibility));
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public String getSignature()
+ {
+ String staticString = isStatic ? "static " : ""; String params = ""; if (getParameters().size() > 0) { for (Parameter param : parameters) { if (!param.getName().equals("ret")) { params += param.getType() + " " + param.getName() + ", "; } } params = params.substring(0, params.length() - 2); } return visibility.toString().toLowerCase() + " " + staticString + returnType + " " + name + "(" + params + ")";
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public void setSignature(String newSignature)
+ {
+ // TODO: implement this method to set the 'Signature' attribute
+ // Ensure that you remove @generated or mark it @generated NOT
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public boolean isIsStatic()
+ {
+ return isStatic;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public void setIsStatic(boolean newIsStatic)
+ {
+ boolean oldIsStatic = isStatic;
+ isStatic = newIsStatic;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, CbcclassPackage.METHOD__IS_STATIC, oldIsStatic, isStatic));
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+ {
+ switch (featureID)
+ {
+ case CbcclassPackage.METHOD__CBC_START_TRIPLE:
+ if (cbcStartTriple != null)
+ msgs = ((InternalEObject)cbcStartTriple).eInverseRemove(this, CbcmodelPackage.CB_CFORMULA__METHOD_OBJ, CbCFormula.class, msgs);
+ return basicSetCbcStartTriple((CbCFormula)otherEnd, msgs);
+ case CbcclassPackage.METHOD__PARENT_CLASS:
+ if (eInternalContainer() != null)
+ msgs = eBasicRemoveFromContainer(msgs);
+ return basicSetParentClass((ModelClass)otherEnd, msgs);
+ }
+ return super.eInverseAdd(otherEnd, featureID, msgs);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+ {
+ switch (featureID)
+ {
+ case CbcclassPackage.METHOD__CBC_START_TRIPLE:
+ return basicSetCbcStartTriple(null, msgs);
+ case CbcclassPackage.METHOD__PARENT_CLASS:
+ return basicSetParentClass(null, msgs);
+ case CbcclassPackage.METHOD__PARAMETERS:
+ return ((InternalEList>)getParameters()).basicRemove(otherEnd, msgs);
+ }
+ return super.eInverseRemove(otherEnd, featureID, msgs);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs)
+ {
+ switch (eContainerFeatureID())
+ {
+ case CbcclassPackage.METHOD__PARENT_CLASS:
+ return eInternalContainer().eInverseRemove(this, CbcclassPackage.MODEL_CLASS__METHODS, ModelClass.class, msgs);
+ }
+ return super.eBasicRemoveFromContainerFeature(msgs);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType)
+ {
+ switch (featureID)
+ {
+ case CbcclassPackage.METHOD__CBC_DIAGRAM_URI:
+ return getCbcDiagramURI();
+ case CbcclassPackage.METHOD__NAME:
+ return getName();
+ case CbcclassPackage.METHOD__ASSIGNABLE:
+ return getAssignable();
+ case CbcclassPackage.METHOD__CBC_START_TRIPLE:
+ if (resolve) return getCbcStartTriple();
+ return basicGetCbcStartTriple();
+ case CbcclassPackage.METHOD__PARENT_CLASS:
+ return getParentClass();
+ case CbcclassPackage.METHOD__PRECONDITION:
+ if (resolve) return getPrecondition();
+ return basicGetPrecondition();
+ case CbcclassPackage.METHOD__POSTCONDITION:
+ if (resolve) return getPostcondition();
+ return basicGetPostcondition();
+ case CbcclassPackage.METHOD__RETURN_TYPE:
+ return getReturnType();
+ case CbcclassPackage.METHOD__PARAMETERS:
+ return getParameters();
+ case CbcclassPackage.METHOD__VISIBILITY:
+ return getVisibility();
+ case CbcclassPackage.METHOD__SIGNATURE:
+ return getSignature();
+ case CbcclassPackage.METHOD__IS_STATIC:
+ return isIsStatic();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @SuppressWarnings("unchecked")
+ @Override
+ public void eSet(int featureID, Object newValue)
+ {
+ switch (featureID)
+ {
+ case CbcclassPackage.METHOD__CBC_DIAGRAM_URI:
+ setCbcDiagramURI((String)newValue);
+ return;
+ case CbcclassPackage.METHOD__NAME:
+ setName((String)newValue);
+ return;
+ case CbcclassPackage.METHOD__ASSIGNABLE:
+ setAssignable((String)newValue);
+ return;
+ case CbcclassPackage.METHOD__CBC_START_TRIPLE:
+ setCbcStartTriple((CbCFormula)newValue);
+ return;
+ case CbcclassPackage.METHOD__PARENT_CLASS:
+ setParentClass((ModelClass)newValue);
+ return;
+ case CbcclassPackage.METHOD__PRECONDITION:
+ setPrecondition((Condition)newValue);
+ return;
+ case CbcclassPackage.METHOD__POSTCONDITION:
+ setPostcondition((Condition)newValue);
+ return;
+ case CbcclassPackage.METHOD__RETURN_TYPE:
+ setReturnType((String)newValue);
+ return;
+ case CbcclassPackage.METHOD__PARAMETERS:
+ getParameters().clear();
+ getParameters().addAll((Collection extends Parameter>)newValue);
+ return;
+ case CbcclassPackage.METHOD__VISIBILITY:
+ setVisibility((Visibility)newValue);
+ return;
+ case CbcclassPackage.METHOD__SIGNATURE:
+ setSignature((String)newValue);
+ return;
+ case CbcclassPackage.METHOD__IS_STATIC:
+ setIsStatic((Boolean)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID)
+ {
+ switch (featureID)
+ {
+ case CbcclassPackage.METHOD__CBC_DIAGRAM_URI:
+ setCbcDiagramURI(CBC_DIAGRAM_URI_EDEFAULT);
+ return;
+ case CbcclassPackage.METHOD__NAME:
+ setName(NAME_EDEFAULT);
+ return;
+ case CbcclassPackage.METHOD__ASSIGNABLE:
+ setAssignable(ASSIGNABLE_EDEFAULT);
+ return;
+ case CbcclassPackage.METHOD__CBC_START_TRIPLE:
+ setCbcStartTriple((CbCFormula)null);
+ return;
+ case CbcclassPackage.METHOD__PARENT_CLASS:
+ setParentClass((ModelClass)null);
+ return;
+ case CbcclassPackage.METHOD__PRECONDITION:
+ setPrecondition((Condition)null);
+ return;
+ case CbcclassPackage.METHOD__POSTCONDITION:
+ setPostcondition((Condition)null);
+ return;
+ case CbcclassPackage.METHOD__RETURN_TYPE:
+ setReturnType(RETURN_TYPE_EDEFAULT);
+ return;
+ case CbcclassPackage.METHOD__PARAMETERS:
+ getParameters().clear();
+ return;
+ case CbcclassPackage.METHOD__VISIBILITY:
+ setVisibility(VISIBILITY_EDEFAULT);
+ return;
+ case CbcclassPackage.METHOD__SIGNATURE:
+ setSignature(SIGNATURE_EDEFAULT);
+ return;
+ case CbcclassPackage.METHOD__IS_STATIC:
+ setIsStatic(IS_STATIC_EDEFAULT);
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID)
+ {
+ switch (featureID)
+ {
+ case CbcclassPackage.METHOD__CBC_DIAGRAM_URI:
+ return CBC_DIAGRAM_URI_EDEFAULT == null ? cbcDiagramURI != null : !CBC_DIAGRAM_URI_EDEFAULT.equals(cbcDiagramURI);
+ case CbcclassPackage.METHOD__NAME:
+ return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+ case CbcclassPackage.METHOD__ASSIGNABLE:
+ return ASSIGNABLE_EDEFAULT == null ? assignable != null : !ASSIGNABLE_EDEFAULT.equals(assignable);
+ case CbcclassPackage.METHOD__CBC_START_TRIPLE:
+ return cbcStartTriple != null;
+ case CbcclassPackage.METHOD__PARENT_CLASS:
+ return getParentClass() != null;
+ case CbcclassPackage.METHOD__PRECONDITION:
+ return basicGetPrecondition() != null;
+ case CbcclassPackage.METHOD__POSTCONDITION:
+ return basicGetPostcondition() != null;
+ case CbcclassPackage.METHOD__RETURN_TYPE:
+ return RETURN_TYPE_EDEFAULT == null ? returnType != null : !RETURN_TYPE_EDEFAULT.equals(returnType);
+ case CbcclassPackage.METHOD__PARAMETERS:
+ return parameters != null && !parameters.isEmpty();
+ case CbcclassPackage.METHOD__VISIBILITY:
+ return visibility != VISIBILITY_EDEFAULT;
+ case CbcclassPackage.METHOD__SIGNATURE:
+ return SIGNATURE_EDEFAULT == null ? getSignature() != null : !SIGNATURE_EDEFAULT.equals(getSignature());
+ case CbcclassPackage.METHOD__IS_STATIC:
+ return isStatic != IS_STATIC_EDEFAULT;
+ }
+ return super.eIsSet(featureID);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public String toString()
+ {
+ if (eIsProxy()) return super.toString();
+
+ StringBuilder result = new StringBuilder(super.toString());
+ result.append(" (cbcDiagramURI: ");
+ result.append(cbcDiagramURI);
+ result.append(", name: ");
+ result.append(name);
+ result.append(", assignable: ");
+ result.append(assignable);
+ result.append(", returnType: ");
+ result.append(returnType);
+ result.append(", visibility: ");
+ result.append(visibility);
+ result.append(", isStatic: ");
+ result.append(isStatic);
+ result.append(')');
+ return result.toString();
+ }
+
+} //MethodImpl
diff --git a/de.tu-bs.cs.isf.cbc.model/src-gen/de/tu_bs/cs/isf/cbc/cbcmodel/impl/JavaVariablesImpl.java b/de.tu-bs.cs.isf.cbc.model/src-gen/de/tu_bs/cs/isf/cbc/cbcmodel/impl/JavaVariablesImpl.java
new file mode 100644
index 000000000..37d8e4331
--- /dev/null
+++ b/de.tu-bs.cs.isf.cbc.model/src-gen/de/tu_bs/cs/isf/cbc/cbcmodel/impl/JavaVariablesImpl.java
@@ -0,0 +1,248 @@
+/**
+ */
+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.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.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.EObjectResolvingEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+/**
+ *
+ * An implementation of the model object 'Java Variables'.
+ *
+ *
+ * The following features are implemented:
+ *
+ *
+ * - {@link de.tu_bs.cs.isf.cbc.cbcmodel.impl.JavaVariablesImpl#getVariables Variables}
+ * - {@link de.tu_bs.cs.isf.cbc.cbcmodel.impl.JavaVariablesImpl#getFields Fields}
+ * - {@link de.tu_bs.cs.isf.cbc.cbcmodel.impl.JavaVariablesImpl#getParams Params}
+ *
+ *
+ * @generated
+ */
+public class JavaVariablesImpl extends MinimalEObjectImpl.Container implements JavaVariables
+{
+ /**
+ * The cached value of the '{@link #getVariables() Variables}' containment reference list.
+ *
+ *
+ * @see #getVariables()
+ * @generated
+ * @ordered
+ */
+ protected EList variables;
+
+ /**
+ * The cached value of the '{@link #getFields() Fields}' reference list.
+ *
+ *
+ * @see #getFields()
+ * @generated
+ * @ordered
+ */
+ protected EList fields;
+
+ /**
+ * The cached value of the '{@link #getParams() Params}' containment reference list.
+ *
+ *
+ * @see #getParams()
+ * @generated
+ * @ordered
+ */
+ protected EList params;
+
+ /**
+ *
+ *
+ * @generated
+ */
+ protected JavaVariablesImpl()
+ {
+ super();
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass()
+ {
+ return CbcmodelPackage.Literals.JAVA_VARIABLES;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public EList getVariables()
+ {
+ if (variables == null)
+ {
+ variables = new EObjectContainmentEList(JavaVariable.class, this, CbcmodelPackage.JAVA_VARIABLES__VARIABLES);
+ }
+ return variables;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public EList getFields()
+ {
+ if (fields == null)
+ {
+ fields = new EObjectResolvingEList(Field.class, this, CbcmodelPackage.JAVA_VARIABLES__FIELDS);
+ }
+ return fields;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public EList getParams()
+ {
+ if (params == null)
+ {
+ params = new EObjectContainmentEList(Parameter.class, this, CbcmodelPackage.JAVA_VARIABLES__PARAMS);
+ }
+ return params;
+ }
+
+ /**
+ *
+ *
+ * @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);
+ }
+
+ /**
+ *
+ *
+ * @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);
+ }
+
+ /**
+ *
+ *
+ * @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);
+ }
+
+ /**
+ *
+ *
+ * @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);
+ }
+
+ /**
+ *
+ *
+ * @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);
+ }
+
+} //JavaVariablesImpl
diff --git a/de.tu-bs.cs.isf.cbc.tool/.DS_Store b/de.tu-bs.cs.isf.cbc.tool/.DS_Store
index b9664577d..0695e0754 100644
Binary files a/de.tu-bs.cs.isf.cbc.tool/.DS_Store and b/de.tu-bs.cs.isf.cbc.tool/.DS_Store differ
diff --git a/de.tu-bs.cs.isf.cbc.util/.DS_Store b/de.tu-bs.cs.isf.cbc.util/.DS_Store
index 50d7e9d86..48b7969c1 100644
Binary files a/de.tu-bs.cs.isf.cbc.util/.DS_Store and b/de.tu-bs.cs.isf.cbc.util/.DS_Store differ
diff --git a/de.tu-bs.cs.isf.cbc.util/META-INF/MANIFEST.MF b/de.tu-bs.cs.isf.cbc.util/META-INF/MANIFEST.MF
index 6bd3553dc..85ab5cd74 100644
--- a/de.tu-bs.cs.isf.cbc.util/META-INF/MANIFEST.MF
+++ b/de.tu-bs.cs.isf.cbc.util/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: Parser
Bundle-SymbolicName: de.tu-bs.cs.isf.cbc.util
Bundle-Version: 1.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-RequiredExecutionEnvironment: JavaSE-16
Require-Bundle: de.tu-bs.cs.isf.cbc.model;bundle-version="0.1.0",
org.key_project.core,
org.key_project.util,
diff --git a/de.tu-bs.cs.isf.cbcclass.tool/.DS_Store b/de.tu-bs.cs.isf.cbcclass.tool/.DS_Store
index fb777b663..90c3267f5 100644
Binary files a/de.tu-bs.cs.isf.cbcclass.tool/.DS_Store and b/de.tu-bs.cs.isf.cbcclass.tool/.DS_Store differ
diff --git a/de.tu-bs.cs.isf.wizards/META-INF/MANIFEST.MF b/de.tu-bs.cs.isf.wizards/META-INF/MANIFEST.MF
index e28d666a3..0da8faba2 100644
--- a/de.tu-bs.cs.isf.wizards/META-INF/MANIFEST.MF
+++ b/de.tu-bs.cs.isf.wizards/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ 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-17
+Bundle-RequiredExecutionEnvironment: JavaSE-16
Import-Package: com.google.common.io;version="2.2.0",
de.tu_bs.cs.isf.cbc.cbcmodel,
org.eclipse.core.resources,
@@ -17,6 +17,10 @@ Import-Package: com.google.common.io;version="2.2.0",
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,
diff --git a/de.tu_bs.cs.isf.cbc.statistics.ui/.DS_Store b/de.tu_bs.cs.isf.cbc.statistics.ui/.DS_Store
index 2dd7e27d5..20c567cfa 100644
Binary files a/de.tu_bs.cs.isf.cbc.statistics.ui/.DS_Store and b/de.tu_bs.cs.isf.cbc.statistics.ui/.DS_Store differ
diff --git a/de.tu_bs.cs.isf.cbc.statistics/.DS_Store b/de.tu_bs.cs.isf.cbc.statistics/.DS_Store
index 5b9472bcf..7a272ef98 100644
Binary files a/de.tu_bs.cs.isf.cbc.statistics/.DS_Store and b/de.tu_bs.cs.isf.cbc.statistics/.DS_Store differ
diff --git a/de.tu_bs.cs.isf.cbc.statistics/pom.xml b/de.tu_bs.cs.isf.cbc.statistics/pom.xml
index 48d70ece8..bd35c2eb2 100644
--- a/de.tu_bs.cs.isf.cbc.statistics/pom.xml
+++ b/de.tu_bs.cs.isf.cbc.statistics/pom.xml
@@ -57,7 +57,7 @@
- ${basedir}/../de.tu_bs.cs.isf.cbc.statistics/src-gen/
+ ${project.basedir}/src-gen/
**/*
diff --git a/de.tu_bs.cs.isf.commands.toolbar/.DS_Store b/de.tu_bs.cs.isf.commands.toolbar/.DS_Store
index e780be6ad..c9cfbf584 100644
Binary files a/de.tu_bs.cs.isf.commands.toolbar/.DS_Store and b/de.tu_bs.cs.isf.commands.toolbar/.DS_Store differ
diff --git a/de.tu_bs.cs.isf.lattice/.DS_Store b/de.tu_bs.cs.isf.lattice/.DS_Store
index 03852462e..756f51ead 100644
Binary files a/de.tu_bs.cs.isf.lattice/.DS_Store and b/de.tu_bs.cs.isf.lattice/.DS_Store differ
diff --git a/pom.xml b/pom.xml
index 04be4cd9c..7e0b28a96 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,27 +85,6 @@ git@github.com:xtext/maven-xtext-example.git-->
true
-
-
- org.apache.maven.plugins
- maven-clean-plugin
- 2.5
-
-
- gen-clean
-
- clean
-
-
-
-
- ${basedir}/xtend-gen
-
-
-
-
-
-