Wall mountings consisting of several layers of materials added

de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/ConstructionCategory.java

+/**
+ */
+package de.hftstuttgart.buildingphysics;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Construction Category</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link de.hftstuttgart.buildingphysics.ConstructionCategory#getName <em>Name</em>}</li>
+ *   <li>{@link de.hftstuttgart.buildingphysics.ConstructionCategory#getMountings <em>Mountings</em>}</li>
+ * </ul>
+ *
+ * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getConstructionCategory()
+ * @model
+ * @generated
+ */
+public interface ConstructionCategory extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Name</em>' attribute.
+	 * @see #setName(String)
+	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getConstructionCategory_Name()
+	 * @model required="true"
+	 * @generated
+	 */
+	String getName();
+
+	/**
+	 * Sets the value of the '{@link de.hftstuttgart.buildingphysics.ConstructionCategory#getName <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Name</em>' attribute.
+	 * @see #getName()
+	 * @generated
+	 */
+	void setName(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Mountings</b></em>' containment reference list.
+	 * The list contents are of type {@link de.hftstuttgart.buildingphysics.Mounting}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Mountings</em>' containment reference list.
+	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getConstructionCategory_Mountings()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<Mounting> getMountings();
+
+} // ConstructionCategory

de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/Layer.java

+/**
+ */
+package de.hftstuttgart.buildingphysics;
+
+import de.hftstuttgart.cityunits.model.NullableQuantity;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Layer</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link de.hftstuttgart.buildingphysics.Layer#getMaterial <em>Material</em>}</li>
+ *   <li>{@link de.hftstuttgart.buildingphysics.Layer#getThickness <em>Thickness</em>}</li>
+ * </ul>
+ *
+ * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getLayer()
+ * @model
+ * @generated
+ */
+public interface Layer extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Material</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Material</em>' reference.
+	 * @see #setMaterial(Material)
+	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getLayer_Material()
+	 * @model keys="materialId" required="true"
+	 * @generated
+	 */
+	Material getMaterial();
+
+	/**
+	 * Sets the value of the '{@link de.hftstuttgart.buildingphysics.Layer#getMaterial <em>Material</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Material</em>' reference.
+	 * @see #getMaterial()
+	 * @generated
+	 */
+	void setMaterial(Material value);
+
+	/**
+	 * Returns the value of the '<em><b>Thickness</b></em>' attribute.
+	 * The default value is <code>"m"</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Thickness</em>' attribute.
+	 * @see #setThickness(NullableQuantity)
+	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getLayer_Thickness()
+	 * @model default="m" dataType="de.hftstuttgart.cityunits.model.quantities.QuantityDouble" required="true"
+	 * @generated
+	 */
+	NullableQuantity getThickness();
+
+	/**
+	 * Sets the value of the '{@link de.hftstuttgart.buildingphysics.Layer#getThickness <em>Thickness</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Thickness</em>' attribute.
+	 * @see #getThickness()
+	 * @generated
+	 */
+	void setThickness(NullableQuantity value);
+
+} // Layer

de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/LifeCycle.java

-/**
- */
-package de.hftstuttgart.buildingphysics;
-
-import de.hftstuttgart.cityunits.model.NullableQuantity;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Life Cycle</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link de.hftstuttgart.buildingphysics.LifeCycle#getEmbodiedEnergy <em>Embodied Energy</em>}</li>
- *   <li>{@link de.hftstuttgart.buildingphysics.LifeCycle#getEmbodiedCarbon <em>Embodied Carbon</em>}</li>
- *   <li>{@link de.hftstuttgart.buildingphysics.LifeCycle#getConstructionDescription <em>Construction Description</em>}</li>
- *   <li>{@link de.hftstuttgart.buildingphysics.LifeCycle#getDisposalEnergy <em>Disposal Energy</em>}</li>
- *   <li>{@link de.hftstuttgart.buildingphysics.LifeCycle#getDisposalCarbon <em>Disposal Carbon</em>}</li>
- *   <li>{@link de.hftstuttgart.buildingphysics.LifeCycle#getDisposalDescription <em>Disposal Description</em>}</li>
- * </ul>
- *
- * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getLifeCycle()
- * @model
- * @generated
- */
-public interface LifeCycle extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Embodied Energy</b></em>' attribute.
-	 * The default value is <code>"kW*h"</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Embodied Energy</em>' attribute.
-	 * @see #setEmbodiedEnergy(NullableQuantity)
-	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getLifeCycle_EmbodiedEnergy()
-	 * @model default="kW*h" dataType="de.hftstuttgart.cityunits.model.quantities.QuantityDouble" required="true"
-	 * @generated
-	 */
-	NullableQuantity getEmbodiedEnergy();
-
-	/**
-	 * Sets the value of the '{@link de.hftstuttgart.buildingphysics.LifeCycle#getEmbodiedEnergy <em>Embodied Energy</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Embodied Energy</em>' attribute.
-	 * @see #getEmbodiedEnergy()
-	 * @generated
-	 */
-	void setEmbodiedEnergy(NullableQuantity value);
-
-	/**
-	 * Returns the value of the '<em><b>Embodied Carbon</b></em>' attribute.
-	 * The default value is <code>"kg"</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Embodied Carbon</em>' attribute.
-	 * @see #setEmbodiedCarbon(NullableQuantity)
-	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getLifeCycle_EmbodiedCarbon()
-	 * @model default="kg" dataType="de.hftstuttgart.cityunits.model.quantities.QuantityDouble" required="true"
-	 * @generated
-	 */
-	NullableQuantity getEmbodiedCarbon();
-
-	/**
-	 * Sets the value of the '{@link de.hftstuttgart.buildingphysics.LifeCycle#getEmbodiedCarbon <em>Embodied Carbon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Embodied Carbon</em>' attribute.
-	 * @see #getEmbodiedCarbon()
-	 * @generated
-	 */
-	void setEmbodiedCarbon(NullableQuantity value);
-
-	/**
-	 * Returns the value of the '<em><b>Construction Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Construction Description</em>' attribute.
-	 * @see #setConstructionDescription(String)
-	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getLifeCycle_ConstructionDescription()
-	 * @model required="true"
-	 * @generated
-	 */
-	String getConstructionDescription();
-
-	/**
-	 * Sets the value of the '{@link de.hftstuttgart.buildingphysics.LifeCycle#getConstructionDescription <em>Construction Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Construction Description</em>' attribute.
-	 * @see #getConstructionDescription()
-	 * @generated
-	 */
-	void setConstructionDescription(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Disposal Energy</b></em>' attribute.
-	 * The default value is <code>"kW*h"</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Disposal Energy</em>' attribute.
-	 * @see #setDisposalEnergy(NullableQuantity)
-	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getLifeCycle_DisposalEnergy()
-	 * @model default="kW*h" dataType="de.hftstuttgart.cityunits.model.quantities.QuantityDouble" required="true"
-	 * @generated
-	 */
-	NullableQuantity getDisposalEnergy();
-
-	/**
-	 * Sets the value of the '{@link de.hftstuttgart.buildingphysics.LifeCycle#getDisposalEnergy <em>Disposal Energy</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Disposal Energy</em>' attribute.
-	 * @see #getDisposalEnergy()
-	 * @generated
-	 */
-	void setDisposalEnergy(NullableQuantity value);
-
-	/**
-	 * Returns the value of the '<em><b>Disposal Carbon</b></em>' attribute.
-	 * The default value is <code>"kg"</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Disposal Carbon</em>' attribute.
-	 * @see #setDisposalCarbon(NullableQuantity)
-	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getLifeCycle_DisposalCarbon()
-	 * @model default="kg" dataType="de.hftstuttgart.cityunits.model.quantities.QuantityDouble" required="true"
-	 * @generated
-	 */
-	NullableQuantity getDisposalCarbon();
-
-	/**
-	 * Sets the value of the '{@link de.hftstuttgart.buildingphysics.LifeCycle#getDisposalCarbon <em>Disposal Carbon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Disposal Carbon</em>' attribute.
-	 * @see #getDisposalCarbon()
-	 * @generated
-	 */
-	void setDisposalCarbon(NullableQuantity value);
-
-	/**
-	 * Returns the value of the '<em><b>Disposal Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Disposal Description</em>' attribute.
-	 * @see #setDisposalDescription(String)
-	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getLifeCycle_DisposalDescription()
-	 * @model required="true"
-	 * @generated
-	 */
-	String getDisposalDescription();
-
-	/**
-	 * Sets the value of the '{@link de.hftstuttgart.buildingphysics.LifeCycle#getDisposalDescription <em>Disposal Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Disposal Description</em>' attribute.
-	 * @see #getDisposalDescription()
-	 * @generated
-	 */
-	void setDisposalDescription(String value);
-
-} // LifeCycle

de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/Material.java

@@ -15,7 +15,7 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link de.hftstuttgart.buildingphysics.Material#getId <em>Id</em>}</li>
+ *   <li>{@link de.hftstuttgart.buildingphysics.Material#getMaterialId <em>Material Id</em>}</li>
  *   <li>{@link de.hftstuttgart.buildingphysics.Material#getName <em>Name</em>}</li>
  *   <li>{@link de.hftstuttgart.buildingphysics.Material#getDensity <em>Density</em>}</li>
  *   <li>{@link de.hftstuttgart.buildingphysics.Material#getHeatCapacity <em>Heat Capacity</em>}</li>
@@ -34,26 +34,26 @@ import org.eclipse.emf.ecore.EObject;
  */
 public interface Material extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
+	 * Returns the value of the '<em><b>Material Id</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(long)
-	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getMaterial_Id()
+	 * @return the value of the '<em>Material Id</em>' attribute.
+	 * @see #setMaterialId(String)
+	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getMaterial_MaterialId()
 	 * @model id="true" required="true"
 	 * @generated
 	 */
-	long getId();
+	String getMaterialId();
 
 	/**
-	 * Sets the value of the '{@link de.hftstuttgart.buildingphysics.Material#getId <em>Id</em>}' attribute.
+	 * Sets the value of the '{@link de.hftstuttgart.buildingphysics.Material#getMaterialId <em>Material Id</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
+	 * @param value the new value of the '<em>Material Id</em>' attribute.
+	 * @see #getMaterialId()
 	 * @generated
 	 */
-	void setId(long value);
+	void setMaterialId(String value);
 
 	/**
 	 * Returns the value of the '<em><b>Name</b></em>' attribute.

de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/MaterialCatalog.java

@@ -14,6 +14,7 @@ import org.eclipse.emf.common.util.EList;
  * </p>
  * <ul>
  *   <li>{@link de.hftstuttgart.buildingphysics.MaterialCatalog#getMaterialCategories <em>Material Categories</em>}</li>
+ *   <li>{@link de.hftstuttgart.buildingphysics.MaterialCatalog#getConstructionCategories <em>Construction Categories</em>}</li>
  * </ul>
  *
  * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getMaterialCatalog()
@@ -33,4 +34,16 @@ public interface MaterialCatalog extends Catalog {
 	 */
 	EList<MaterialCategory> getMaterialCategories();
 
+	/**
+	 * Returns the value of the '<em><b>Construction Categories</b></em>' containment reference list.
+	 * The list contents are of type {@link de.hftstuttgart.buildingphysics.ConstructionCategory}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Construction Categories</em>' containment reference list.
+	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getMaterialCatalog_ConstructionCategories()
+	 * @model containment="true" required="true"
+	 * @generated
+	 */
+	EList<ConstructionCategory> getConstructionCategories();
+
 } // MaterialCatalog

de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/MaterialCategory.java

@@ -15,7 +15,7 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link de.hftstuttgart.buildingphysics.MaterialCategory#getMaterial <em>Material</em>}</li>
+ *   <li>{@link de.hftstuttgart.buildingphysics.MaterialCategory#getMaterials <em>Materials</em>}</li>
  *   <li>{@link de.hftstuttgart.buildingphysics.MaterialCategory#getName <em>Name</em>}</li>
  * </ul>
  *
@@ -25,16 +25,16 @@ import org.eclipse.emf.ecore.EObject;
  */
 public interface MaterialCategory extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Material</b></em>' containment reference list.
+	 * Returns the value of the '<em><b>Materials</b></em>' containment reference list.
 	 * The list contents are of type {@link de.hftstuttgart.buildingphysics.Material}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Material</em>' containment reference list.
-	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getMaterialCategory_Material()
+	 * @return the value of the '<em>Materials</em>' containment reference list.
+	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getMaterialCategory_Materials()
 	 * @model containment="true"
 	 * @generated
 	 */
-	EList<Material> getMaterial();
+	EList<Material> getMaterials();
 
 	/**
 	 * Returns the value of the '<em><b>Name</b></em>' attribute.

de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/Mounting.java

+/**
+ */
+package de.hftstuttgart.buildingphysics;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Mounting</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link de.hftstuttgart.buildingphysics.Mounting#getMountingId <em>Mounting Id</em>}</li>
+ *   <li>{@link de.hftstuttgart.buildingphysics.Mounting#getName <em>Name</em>}</li>
+ *   <li>{@link de.hftstuttgart.buildingphysics.Mounting#getLayers <em>Layers</em>}</li>
+ * </ul>
+ *
+ * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getMounting()
+ * @model
+ * @generated
+ */
+public interface Mounting extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Mounting Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Mounting Id</em>' attribute.
+	 * @see #setMountingId(String)
+	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getMounting_MountingId()
+	 * @model required="true"
+	 * @generated
+	 */
+	String getMountingId();
+
+	/**
+	 * Sets the value of the '{@link de.hftstuttgart.buildingphysics.Mounting#getMountingId <em>Mounting Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Mounting Id</em>' attribute.
+	 * @see #getMountingId()
+	 * @generated
+	 */
+	void setMountingId(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Name</em>' attribute.
+	 * @see #setName(String)
+	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getMounting_Name()
+	 * @model required="true"
+	 * @generated
+	 */
+	String getName();
+
+	/**
+	 * Sets the value of the '{@link de.hftstuttgart.buildingphysics.Mounting#getName <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Name</em>' attribute.
+	 * @see #getName()
+	 * @generated
+	 */
+	void setName(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Layers</b></em>' containment reference list.
+	 * The list contents are of type {@link de.hftstuttgart.buildingphysics.Layer}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Layers</em>' containment reference list.
+	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getMounting_Layers()
+	 * @model containment="true" required="true"
+	 * @generated
+	 */
+	EList<Layer> getLayers();
+
+} // Mounting

de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/WindowType.java

@@ -3,6 +3,7 @@
 package de.hftstuttgart.buildingphysics;
 
 import de.hftstuttgart.cityunits.model.NullableQuantity;
+
 import org.eclipse.emf.ecore.EObject;
 
 /**
@@ -14,7 +15,7 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link de.hftstuttgart.buildingphysics.WindowType#getId <em>Id</em>}</li>
+ *   <li>{@link de.hftstuttgart.buildingphysics.WindowType#getWindowTypeId <em>Window Type Id</em>}</li>
  *   <li>{@link de.hftstuttgart.buildingphysics.WindowType#getName <em>Name</em>}</li>
  *   <li>{@link de.hftstuttgart.buildingphysics.WindowType#getUValue <em>UValue</em>}</li>
  *   <li>{@link de.hftstuttgart.buildingphysics.WindowType#getGValue <em>GValue</em>}</li>
@@ -34,26 +35,26 @@ import org.eclipse.emf.ecore.EObject;
  */
 public interface WindowType extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
+	 * Returns the value of the '<em><b>Window Type Id</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(int)
-	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getWindowType_Id()
-	 * @model id="true" required="true"
+	 * @return the value of the '<em>Window Type Id</em>' attribute.
+	 * @see #setWindowTypeId(String)
+	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getWindowType_WindowTypeId()
+	 * @model required="true"
 	 * @generated
 	 */
-	int getId();
+	String getWindowTypeId();
 
 	/**
-	 * Sets the value of the '{@link de.hftstuttgart.buildingphysics.WindowType#getId <em>Id</em>}' attribute.
+	 * Sets the value of the '{@link de.hftstuttgart.buildingphysics.WindowType#getWindowTypeId <em>Window Type Id</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
+	 * @param value the new value of the '<em>Window Type Id</em>' attribute.
+	 * @see #getWindowTypeId()
 	 * @generated
 	 */
-	void setId(int value);
+	void setWindowTypeId(String value);
 
 	/**
 	 * Returns the value of the '<em><b>Name</b></em>' attribute.

de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/BuildingPhysicsFactoryImpl.java

@@ -68,6 +68,12 @@ public class BuildingPhysicsFactoryImpl extends EFactoryImpl implements Building
 			return createMaterialCategory();
 		case BuildingPhysicsPackage.MATERIAL:
 			return createMaterial();
+		case BuildingPhysicsPackage.CONSTRUCTION_CATEGORY:
+			return createConstructionCategory();
+		case BuildingPhysicsPackage.MOUNTING:
+			return createMounting();
+		case BuildingPhysicsPackage.LAYER:
+			return createLayer();
 		default:
 			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
 		}
@@ -139,6 +145,39 @@ public class BuildingPhysicsFactoryImpl extends EFactoryImpl implements Building
 		return material;
 	}
 
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ConstructionCategory createConstructionCategory() {
+		ConstructionCategoryImpl constructionCategory = new ConstructionCategoryImpl();
+		return constructionCategory;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Mounting createMounting() {
+		MountingImpl mounting = new MountingImpl();
+		return mounting;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Layer createLayer() {
+		LayerImpl layer = new LayerImpl();
+		return layer;
+	}
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->

de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/BuildingPhysicsPackageImpl.java

@@ -6,9 +6,12 @@ import de.hftstuttgart.buildingphysics.BuildingPhysicsCatalog;
 import de.hftstuttgart.buildingphysics.BuildingPhysicsFactory;
 import de.hftstuttgart.buildingphysics.BuildingPhysicsPackage;
 import de.hftstuttgart.buildingphysics.Catalog;
+import de.hftstuttgart.buildingphysics.ConstructionCategory;
+import de.hftstuttgart.buildingphysics.Layer;
 import de.hftstuttgart.buildingphysics.Material;
 import de.hftstuttgart.buildingphysics.MaterialCatalog;
 import de.hftstuttgart.buildingphysics.MaterialCategory;
+import de.hftstuttgart.buildingphysics.Mounting;
 import de.hftstuttgart.buildingphysics.WindowCatalog;
 import de.hftstuttgart.buildingphysics.WindowType;
 
@@ -77,6 +80,27 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
 	 */
 	private EClass materialEClass = null;
 
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass constructionCategoryEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass mountingEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass layerEClass = null;
+
 	/**
 	 * Creates an instance of the model <b>Package</b>, registered with
 	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
@@ -200,7 +224,7 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
 	 * @generated
 	 */
 	@Override
-	public EAttribute getWindowType_Id() {
+	public EAttribute getWindowType_WindowTypeId() {
 		return (EAttribute) windowTypeEClass.getEStructuralFeatures().get(0);
 	}
 
@@ -394,6 +418,16 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
 		return (EReference) materialCatalogEClass.getEStructuralFeatures().get(0);
 	}
 
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getMaterialCatalog_ConstructionCategories() {
+		return (EReference) materialCatalogEClass.getEStructuralFeatures().get(1);
+	}
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -410,7 +444,7 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
 	 * @generated
 	 */
 	@Override
-	public EReference getMaterialCategory_Material() {
+	public EReference getMaterialCategory_Materials() {
 		return (EReference) materialCategoryEClass.getEStructuralFeatures().get(0);
 	}
 
@@ -440,7 +474,7 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
 	 * @generated
 	 */
 	@Override
-	public EAttribute getMaterial_Id() {
+	public EAttribute getMaterial_MaterialId() {
 		return (EAttribute) materialEClass.getEStructuralFeatures().get(0);
 	}
 
@@ -544,6 +578,106 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
 		return (EAttribute) materialEClass.getEStructuralFeatures().get(10);
 	}
 
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getConstructionCategory() {
+		return constructionCategoryEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getConstructionCategory_Name() {
+		return (EAttribute) constructionCategoryEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getConstructionCategory_Mountings() {
+		return (EReference) constructionCategoryEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getMounting() {
+		return mountingEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getMounting_MountingId() {
+		return (EAttribute) mountingEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getMounting_Name() {
+		return (EAttribute) mountingEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getMounting_Layers() {
+		return (EReference) mountingEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getLayer() {
+		return layerEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getLayer_Material() {
+		return (EReference) layerEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getLayer_Thickness() {
+		return (EAttribute) layerEClass.getEStructuralFeatures().get(1);
+	}
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -580,7 +714,7 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
 		createEReference(buildingPhysicsCatalogEClass, BUILDING_PHYSICS_CATALOG__MATERIAL_CATALOG);
 
 		windowTypeEClass = createEClass(WINDOW_TYPE);
-		createEAttribute(windowTypeEClass, WINDOW_TYPE__ID);
+		createEAttribute(windowTypeEClass, WINDOW_TYPE__WINDOW_TYPE_ID);
 		createEAttribute(windowTypeEClass, WINDOW_TYPE__NAME);
 		createEAttribute(windowTypeEClass, WINDOW_TYPE__UVALUE);
 		createEAttribute(windowTypeEClass, WINDOW_TYPE__GVALUE);
@@ -603,13 +737,14 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
 
 		materialCatalogEClass = createEClass(MATERIAL_CATALOG);
 		createEReference(materialCatalogEClass, MATERIAL_CATALOG__MATERIAL_CATEGORIES);
+		createEReference(materialCatalogEClass, MATERIAL_CATALOG__CONSTRUCTION_CATEGORIES);
 
 		materialCategoryEClass = createEClass(MATERIAL_CATEGORY);
-		createEReference(materialCategoryEClass, MATERIAL_CATEGORY__MATERIAL);
+		createEReference(materialCategoryEClass, MATERIAL_CATEGORY__MATERIALS);
 		createEAttribute(materialCategoryEClass, MATERIAL_CATEGORY__NAME);
 
 		materialEClass = createEClass(MATERIAL);
-		createEAttribute(materialEClass, MATERIAL__ID);
+		createEAttribute(materialEClass, MATERIAL__MATERIAL_ID);
 		createEAttribute(materialEClass, MATERIAL__NAME);
 		createEAttribute(materialEClass, MATERIAL__DENSITY);
 		createEAttribute(materialEClass, MATERIAL__HEAT_CAPACITY);
@@ -620,6 +755,19 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
 		createEAttribute(materialEClass, MATERIAL__DISPOSAL_ENERGY);
 		createEAttribute(materialEClass, MATERIAL__DISPOSAL_CARBON);
 		createEAttribute(materialEClass, MATERIAL__DISPOSAL_DESCRIPTION);
+
+		constructionCategoryEClass = createEClass(CONSTRUCTION_CATEGORY);
+		createEAttribute(constructionCategoryEClass, CONSTRUCTION_CATEGORY__NAME);
+		createEReference(constructionCategoryEClass, CONSTRUCTION_CATEGORY__MOUNTINGS);
+
+		mountingEClass = createEClass(MOUNTING);
+		createEAttribute(mountingEClass, MOUNTING__MOUNTING_ID);
+		createEAttribute(mountingEClass, MOUNTING__NAME);
+		createEReference(mountingEClass, MOUNTING__LAYERS);
+
+		layerEClass = createEClass(LAYER);
+		createEReference(layerEClass, LAYER__MATERIAL);
+		createEAttribute(layerEClass, LAYER__THICKNESS);
 	}
 
 	/**
@@ -673,8 +821,9 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
 
 		initEClass(windowTypeEClass, WindowType.class, "WindowType", !IS_ABSTRACT, !IS_INTERFACE,
 				IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getWindowType_Id(), ecorePackage.getEInt(), "id", null, 1, 1, WindowType.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getWindowType_WindowTypeId(), ecorePackage.getEString(), "windowTypeId", null, 1, 1,
+				WindowType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
 		initEAttribute(getWindowType_Name(), ecorePackage.getEString(), "name", null, 1, 1, WindowType.class,
 				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getWindowType_UValue(), theQuantitiesPackage.getQuantityDouble(), "uValue", "W/(m\u00b2*K)", 1,
@@ -726,10 +875,13 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
 		initEReference(getMaterialCatalog_MaterialCategories(), this.getMaterialCategory(), null, "materialCategories",
 				null, 0, -1, MaterialCatalog.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
 				!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getMaterialCatalog_ConstructionCategories(), this.getConstructionCategory(), null,
+				"constructionCategories", null, 1, -1, MaterialCatalog.class, !IS_TRANSIENT, !IS_VOLATILE,
+				IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(materialCategoryEClass, MaterialCategory.class, "MaterialCategory", !IS_ABSTRACT, !IS_INTERFACE,
 				IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getMaterialCategory_Material(), this.getMaterial(), null, "material", null, 0, -1,
+		initEReference(getMaterialCategory_Materials(), this.getMaterial(), null, "materials", null, 0, -1,
 				MaterialCategory.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
 				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getMaterialCategory_Name(), ecorePackage.getEString(), "name", null, 1, 1,
@@ -738,8 +890,8 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
 
 		initEClass(materialEClass, Material.class, "Material", !IS_ABSTRACT, !IS_INTERFACE,
 				IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getMaterial_Id(), ecorePackage.getELong(), "id", null, 1, 1, Material.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getMaterial_MaterialId(), ecorePackage.getEString(), "materialId", null, 1, 1, Material.class,
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getMaterial_Name(), ecorePackage.getEString(), "name", null, 1, 1, Material.class, !IS_TRANSIENT,
 				!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getMaterial_Density(), theQuantitiesPackage.getQuantityDouble(), "density", "kg/m\u00b3", 1, 1,
@@ -770,6 +922,34 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
 				Material.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
 				!IS_DERIVED, IS_ORDERED);
 
+		initEClass(constructionCategoryEClass, ConstructionCategory.class, "ConstructionCategory", !IS_ABSTRACT,
+				!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getConstructionCategory_Name(), ecorePackage.getEString(), "name", null, 1, 1,
+				ConstructionCategory.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getConstructionCategory_Mountings(), this.getMounting(), null, "mountings", null, 0, -1,
+				ConstructionCategory.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+				!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(mountingEClass, Mounting.class, "Mounting", !IS_ABSTRACT, !IS_INTERFACE,
+				IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getMounting_MountingId(), ecorePackage.getEString(), "mountingId", null, 1, 1, Mounting.class,
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getMounting_Name(), ecorePackage.getEString(), "name", null, 1, 1, Mounting.class, !IS_TRANSIENT,
+				!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getMounting_Layers(), this.getLayer(), null, "layers", null, 1, -1, Mounting.class,
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(layerEClass, Layer.class, "Layer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getLayer_Material(), this.getMaterial(), null, "material", null, 1, 1, Layer.class,
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+				!IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		getLayer_Material().getEKeys().add(this.getMaterial_MaterialId());
+		initEAttribute(getLayer_Thickness(), theQuantitiesPackage.getQuantityDouble(), "thickness", "m", 1, 1,
+				Layer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+
 		// Create resource
 		createResource(eNS_URI);
 	}

de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/ConstructionCategoryImpl.java

+/**
+ */
+package de.hftstuttgart.buildingphysics.impl;
+
+import de.hftstuttgart.buildingphysics.BuildingPhysicsPackage;
+import de.hftstuttgart.buildingphysics.ConstructionCategory;
+import de.hftstuttgart.buildingphysics.Mounting;
+
+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.InternalEList;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Construction Category</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link de.hftstuttgart.buildingphysics.impl.ConstructionCategoryImpl#getName <em>Name</em>}</li>
+ *   <li>{@link de.hftstuttgart.buildingphysics.impl.ConstructionCategoryImpl#getMountings <em>Mountings</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class ConstructionCategoryImpl extends MinimalEObjectImpl.Container implements ConstructionCategory {
+	/**
+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String name = NAME_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getMountings() <em>Mountings</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMountings()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<Mounting> mountings;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ConstructionCategoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return BuildingPhysicsPackage.Literals.CONSTRUCTION_CATEGORY;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setName(String newName) {
+		String oldName = name;
+		name = newName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, BuildingPhysicsPackage.CONSTRUCTION_CATEGORY__NAME,
+					oldName, name));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<Mounting> getMountings() {
+		if (mountings == null) {
+			mountings = new EObjectContainmentEList<Mounting>(Mounting.class, this,
+					BuildingPhysicsPackage.CONSTRUCTION_CATEGORY__MOUNTINGS);
+		}
+		return mountings;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+		case BuildingPhysicsPackage.CONSTRUCTION_CATEGORY__MOUNTINGS:
+			return ((InternalEList<?>) getMountings()).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 BuildingPhysicsPackage.CONSTRUCTION_CATEGORY__NAME:
+			return getName();
+		case BuildingPhysicsPackage.CONSTRUCTION_CATEGORY__MOUNTINGS:
+			return getMountings();
+		}
+		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 BuildingPhysicsPackage.CONSTRUCTION_CATEGORY__NAME:
+			setName((String) newValue);
+			return;
+		case BuildingPhysicsPackage.CONSTRUCTION_CATEGORY__MOUNTINGS:
+			getMountings().clear();
+			getMountings().addAll((Collection<? extends Mounting>) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case BuildingPhysicsPackage.CONSTRUCTION_CATEGORY__NAME:
+			setName(NAME_EDEFAULT);
+			return;
+		case BuildingPhysicsPackage.CONSTRUCTION_CATEGORY__MOUNTINGS:
+			getMountings().clear();
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case BuildingPhysicsPackage.CONSTRUCTION_CATEGORY__NAME:
+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+		case BuildingPhysicsPackage.CONSTRUCTION_CATEGORY__MOUNTINGS:
+			return mountings != null && !mountings.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy())
+			return super.toString();
+
+		StringBuilder result = new StringBuilder(super.toString());
+		result.append(" (name: ");
+		result.append(name);
+		result.append(')');
+		return result.toString();
+	}
+
+} //ConstructionCategoryImpl

de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/LayerImpl.java

+/**
+ */
+package de.hftstuttgart.buildingphysics.impl;
+
+import de.hftstuttgart.buildingphysics.BuildingPhysicsPackage;
+import de.hftstuttgart.buildingphysics.Layer;
+import de.hftstuttgart.buildingphysics.Material;
+
+import de.hftstuttgart.cityunits.model.NullableQuantity;
+
+import de.hftstuttgart.cityunits.model.quantities.QuantitiesFactory;
+import de.hftstuttgart.cityunits.model.quantities.QuantitiesPackage;
+
+import org.eclipse.emf.common.notify.Notification;
+
+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;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Layer</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link de.hftstuttgart.buildingphysics.impl.LayerImpl#getMaterial <em>Material</em>}</li>
+ *   <li>{@link de.hftstuttgart.buildingphysics.impl.LayerImpl#getThickness <em>Thickness</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class LayerImpl extends MinimalEObjectImpl.Container implements Layer {
+	/**
+	 * The cached value of the '{@link #getMaterial() <em>Material</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMaterial()
+	 * @generated
+	 * @ordered
+	 */
+	protected Material material;
+
+	/**
+	 * The default value of the '{@link #getThickness() <em>Thickness</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getThickness()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final NullableQuantity THICKNESS_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE
+			.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "m");
+
+	/**
+	 * The cached value of the '{@link #getThickness() <em>Thickness</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getThickness()
+	 * @generated
+	 * @ordered
+	 */
+	protected NullableQuantity thickness = THICKNESS_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected LayerImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return BuildingPhysicsPackage.Literals.LAYER;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Material getMaterial() {
+		if (material != null && material.eIsProxy()) {
+			InternalEObject oldMaterial = (InternalEObject) material;
+			material = (Material) eResolveProxy(oldMaterial);
+			if (material != oldMaterial) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BuildingPhysicsPackage.LAYER__MATERIAL,
+							oldMaterial, material));
+			}
+		}
+		return material;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Material basicGetMaterial() {
+		return material;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setMaterial(Material newMaterial) {
+		Material oldMaterial = material;
+		material = newMaterial;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, BuildingPhysicsPackage.LAYER__MATERIAL, oldMaterial,
+					material));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NullableQuantity getThickness() {
+		return thickness;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setThickness(NullableQuantity newThickness) {
+		NullableQuantity oldThickness = thickness;
+		thickness = newThickness;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, BuildingPhysicsPackage.LAYER__THICKNESS, oldThickness,
+					thickness));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case BuildingPhysicsPackage.LAYER__MATERIAL:
+			if (resolve)
+				return getMaterial();
+			return basicGetMaterial();
+		case BuildingPhysicsPackage.LAYER__THICKNESS:
+			return getThickness();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case BuildingPhysicsPackage.LAYER__MATERIAL:
+			setMaterial((Material) newValue);
+			return;
+		case BuildingPhysicsPackage.LAYER__THICKNESS:
+			setThickness((NullableQuantity) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case BuildingPhysicsPackage.LAYER__MATERIAL:
+			setMaterial((Material) null);
+			return;
+		case BuildingPhysicsPackage.LAYER__THICKNESS:
+			setThickness(THICKNESS_EDEFAULT);
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case BuildingPhysicsPackage.LAYER__MATERIAL:
+			return material != null;
+		case BuildingPhysicsPackage.LAYER__THICKNESS:
+			return THICKNESS_EDEFAULT == null ? thickness != null : !THICKNESS_EDEFAULT.equals(thickness);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy())
+			return super.toString();
+
+		StringBuilder result = new StringBuilder(super.toString());
+		result.append(" (thickness: ");
+		result.append(thickness);
+		result.append(')');
+		return result.toString();
+	}
+
+} //LayerImpl

de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/MaterialCatalogImpl.java

@@ -3,6 +3,7 @@
 package de.hftstuttgart.buildingphysics.impl;
 
 import de.hftstuttgart.buildingphysics.BuildingPhysicsPackage;
+import de.hftstuttgart.buildingphysics.ConstructionCategory;
 import de.hftstuttgart.buildingphysics.MaterialCatalog;
 import de.hftstuttgart.buildingphysics.MaterialCategory;
 
@@ -27,6 +28,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * </p>
  * <ul>
  *   <li>{@link de.hftstuttgart.buildingphysics.impl.MaterialCatalogImpl#getMaterialCategories <em>Material Categories</em>}</li>
+ *   <li>{@link de.hftstuttgart.buildingphysics.impl.MaterialCatalogImpl#getConstructionCategories <em>Construction Categories</em>}</li>
  * </ul>
  *
  * @generated
@@ -42,6 +44,16 @@ public class MaterialCatalogImpl extends CatalogImpl implements MaterialCatalog
 	 */
 	protected EList<MaterialCategory> materialCategories;
 
+	/**
+	 * The cached value of the '{@link #getConstructionCategories() <em>Construction Categories</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getConstructionCategories()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<ConstructionCategory> constructionCategories;
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -75,6 +87,20 @@ public class MaterialCatalogImpl extends CatalogImpl implements MaterialCatalog
 		return materialCategories;
 	}
 
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<ConstructionCategory> getConstructionCategories() {
+		if (constructionCategories == null) {
+			constructionCategories = new EObjectContainmentEList<ConstructionCategory>(ConstructionCategory.class, this,
+					BuildingPhysicsPackage.MATERIAL_CATALOG__CONSTRUCTION_CATEGORIES);
+		}
+		return constructionCategories;
+	}
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -85,6 +111,8 @@ public class MaterialCatalogImpl extends CatalogImpl implements MaterialCatalog
 		switch (featureID) {
 		case BuildingPhysicsPackage.MATERIAL_CATALOG__MATERIAL_CATEGORIES:
 			return ((InternalEList<?>) getMaterialCategories()).basicRemove(otherEnd, msgs);
+		case BuildingPhysicsPackage.MATERIAL_CATALOG__CONSTRUCTION_CATEGORIES:
+			return ((InternalEList<?>) getConstructionCategories()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -99,6 +127,8 @@ public class MaterialCatalogImpl extends CatalogImpl implements MaterialCatalog
 		switch (featureID) {
 		case BuildingPhysicsPackage.MATERIAL_CATALOG__MATERIAL_CATEGORIES:
 			return getMaterialCategories();
+		case BuildingPhysicsPackage.MATERIAL_CATALOG__CONSTRUCTION_CATEGORIES:
+			return getConstructionCategories();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -116,6 +146,10 @@ public class MaterialCatalogImpl extends CatalogImpl implements MaterialCatalog
 			getMaterialCategories().clear();
 			getMaterialCategories().addAll((Collection<? extends MaterialCategory>) newValue);
 			return;
+		case BuildingPhysicsPackage.MATERIAL_CATALOG__CONSTRUCTION_CATEGORIES:
+			getConstructionCategories().clear();
+			getConstructionCategories().addAll((Collection<? extends ConstructionCategory>) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -131,6 +165,9 @@ public class MaterialCatalogImpl extends CatalogImpl implements MaterialCatalog
 		case BuildingPhysicsPackage.MATERIAL_CATALOG__MATERIAL_CATEGORIES:
 			getMaterialCategories().clear();
 			return;
+		case BuildingPhysicsPackage.MATERIAL_CATALOG__CONSTRUCTION_CATEGORIES:
+			getConstructionCategories().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -145,6 +182,8 @@ public class MaterialCatalogImpl extends CatalogImpl implements MaterialCatalog
 		switch (featureID) {
 		case BuildingPhysicsPackage.MATERIAL_CATALOG__MATERIAL_CATEGORIES:
 			return materialCategories != null && !materialCategories.isEmpty();
+		case BuildingPhysicsPackage.MATERIAL_CATALOG__CONSTRUCTION_CATEGORIES:
+			return constructionCategories != null && !constructionCategories.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}

de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/MaterialCategoryImpl.java

@@ -30,7 +30,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link de.hftstuttgart.buildingphysics.impl.MaterialCategoryImpl#getMaterial <em>Material</em>}</li>
+ *   <li>{@link de.hftstuttgart.buildingphysics.impl.MaterialCategoryImpl#getMaterials <em>Materials</em>}</li>
  *   <li>{@link de.hftstuttgart.buildingphysics.impl.MaterialCategoryImpl#getName <em>Name</em>}</li>
  * </ul>
  *
@@ -38,14 +38,14 @@ import org.eclipse.emf.ecore.util.InternalEList;
  */
 public class MaterialCategoryImpl extends MinimalEObjectImpl.Container implements MaterialCategory {
 	/**
-	 * The cached value of the '{@link #getMaterial() <em>Material</em>}' containment reference list.
+	 * The cached value of the '{@link #getMaterials() <em>Materials</em>}' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getMaterial()
+	 * @see #getMaterials()
 	 * @generated
 	 * @ordered
 	 */
-	protected EList<Material> material;
+	protected EList<Material> materials;
 
 	/**
 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
@@ -92,12 +92,12 @@ public class MaterialCategoryImpl extends MinimalEObjectImpl.Container implement
 	 * @generated
 	 */
 	@Override
-	public EList<Material> getMaterial() {
-		if (material == null) {
-			material = new EObjectContainmentEList<Material>(Material.class, this,
-					BuildingPhysicsPackage.MATERIAL_CATEGORY__MATERIAL);
+	public EList<Material> getMaterials() {
+		if (materials == null) {
+			materials = new EObjectContainmentEList<Material>(Material.class, this,
+					BuildingPhysicsPackage.MATERIAL_CATEGORY__MATERIALS);
 		}
-		return material;
+		return materials;
 	}
 
 	/**
@@ -132,8 +132,8 @@ public class MaterialCategoryImpl extends MinimalEObjectImpl.Container implement
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-		case BuildingPhysicsPackage.MATERIAL_CATEGORY__MATERIAL:
-			return ((InternalEList<?>) getMaterial()).basicRemove(otherEnd, msgs);
+		case BuildingPhysicsPackage.MATERIAL_CATEGORY__MATERIALS:
+			return ((InternalEList<?>) getMaterials()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -146,8 +146,8 @@ public class MaterialCategoryImpl extends MinimalEObjectImpl.Container implement
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case BuildingPhysicsPackage.MATERIAL_CATEGORY__MATERIAL:
-			return getMaterial();
+		case BuildingPhysicsPackage.MATERIAL_CATEGORY__MATERIALS:
+			return getMaterials();
 		case BuildingPhysicsPackage.MATERIAL_CATEGORY__NAME:
 			return getName();
 		}
@@ -163,9 +163,9 @@ public class MaterialCategoryImpl extends MinimalEObjectImpl.Container implement
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case BuildingPhysicsPackage.MATERIAL_CATEGORY__MATERIAL:
-			getMaterial().clear();
-			getMaterial().addAll((Collection<? extends Material>) newValue);
+		case BuildingPhysicsPackage.MATERIAL_CATEGORY__MATERIALS:
+			getMaterials().clear();
+			getMaterials().addAll((Collection<? extends Material>) newValue);
 			return;
 		case BuildingPhysicsPackage.MATERIAL_CATEGORY__NAME:
 			setName((String) newValue);
@@ -182,8 +182,8 @@ public class MaterialCategoryImpl extends MinimalEObjectImpl.Container implement
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case BuildingPhysicsPackage.MATERIAL_CATEGORY__MATERIAL:
-			getMaterial().clear();
+		case BuildingPhysicsPackage.MATERIAL_CATEGORY__MATERIALS:
+			getMaterials().clear();
 			return;
 		case BuildingPhysicsPackage.MATERIAL_CATEGORY__NAME:
 			setName(NAME_EDEFAULT);
@@ -200,8 +200,8 @@ public class MaterialCategoryImpl extends MinimalEObjectImpl.Container implement
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case BuildingPhysicsPackage.MATERIAL_CATEGORY__MATERIAL:
-			return material != null && !material.isEmpty();
+		case BuildingPhysicsPackage.MATERIAL_CATEGORY__MATERIALS:
+			return materials != null && !materials.isEmpty();
 		case BuildingPhysicsPackage.MATERIAL_CATEGORY__NAME:
 			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
 		}

de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/MaterialImpl.java

@@ -25,7 +25,7 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link de.hftstuttgart.buildingphysics.impl.MaterialImpl#getId <em>Id</em>}</li>
+ *   <li>{@link de.hftstuttgart.buildingphysics.impl.MaterialImpl#getMaterialId <em>Material Id</em>}</li>
  *   <li>{@link de.hftstuttgart.buildingphysics.impl.MaterialImpl#getName <em>Name</em>}</li>
  *   <li>{@link de.hftstuttgart.buildingphysics.impl.MaterialImpl#getDensity <em>Density</em>}</li>
  *   <li>{@link de.hftstuttgart.buildingphysics.impl.MaterialImpl#getHeatCapacity <em>Heat Capacity</em>}</li>
@@ -42,24 +42,24 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  */
 public class MaterialImpl extends MinimalEObjectImpl.Container implements Material {
 	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
+	 * The default value of the '{@link #getMaterialId() <em>Material Id</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getId()
+	 * @see #getMaterialId()
 	 * @generated
 	 * @ordered
 	 */
-	protected static final long ID_EDEFAULT = 0L;
+	protected static final String MATERIAL_ID_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
+	 * The cached value of the '{@link #getMaterialId() <em>Material Id</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getId()
+	 * @see #getMaterialId()
 	 * @generated
 	 * @ordered
 	 */
-	protected long id = ID_EDEFAULT;
+	protected String materialId = MATERIAL_ID_EDEFAULT;
 
 	/**
 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
@@ -293,8 +293,8 @@ public class MaterialImpl extends MinimalEObjectImpl.Container implements Materi
 	 * @generated
 	 */
 	@Override
-	public long getId() {
-		return id;
+	public String getMaterialId() {
+		return materialId;
 	}
 
 	/**
@@ -303,11 +303,12 @@ public class MaterialImpl extends MinimalEObjectImpl.Container implements Materi
 	 * @generated
 	 */
 	@Override
-	public void setId(long newId) {
-		long oldId = id;
-		id = newId;
+	public void setMaterialId(String newMaterialId) {
+		String oldMaterialId = materialId;
+		materialId = newMaterialId;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildingPhysicsPackage.MATERIAL__ID, oldId, id));
+			eNotify(new ENotificationImpl(this, Notification.SET, BuildingPhysicsPackage.MATERIAL__MATERIAL_ID,
+					oldMaterialId, materialId));
 	}
 
 	/**
@@ -559,8 +560,8 @@ public class MaterialImpl extends MinimalEObjectImpl.Container implements Materi
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case BuildingPhysicsPackage.MATERIAL__ID:
-			return getId();
+		case BuildingPhysicsPackage.MATERIAL__MATERIAL_ID:
+			return getMaterialId();
 		case BuildingPhysicsPackage.MATERIAL__NAME:
 			return getName();
 		case BuildingPhysicsPackage.MATERIAL__DENSITY:
@@ -593,8 +594,8 @@ public class MaterialImpl extends MinimalEObjectImpl.Container implements Materi
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case BuildingPhysicsPackage.MATERIAL__ID:
-			setId((Long) newValue);
+		case BuildingPhysicsPackage.MATERIAL__MATERIAL_ID:
+			setMaterialId((String) newValue);
 			return;
 		case BuildingPhysicsPackage.MATERIAL__NAME:
 			setName((String) newValue);
@@ -638,8 +639,8 @@ public class MaterialImpl extends MinimalEObjectImpl.Container implements Materi
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case BuildingPhysicsPackage.MATERIAL__ID:
-			setId(ID_EDEFAULT);
+		case BuildingPhysicsPackage.MATERIAL__MATERIAL_ID:
+			setMaterialId(MATERIAL_ID_EDEFAULT);
 			return;
 		case BuildingPhysicsPackage.MATERIAL__NAME:
 			setName(NAME_EDEFAULT);
@@ -683,8 +684,8 @@ public class MaterialImpl extends MinimalEObjectImpl.Container implements Materi
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case BuildingPhysicsPackage.MATERIAL__ID:
-			return id != ID_EDEFAULT;
+		case BuildingPhysicsPackage.MATERIAL__MATERIAL_ID:
+			return MATERIAL_ID_EDEFAULT == null ? materialId != null : !MATERIAL_ID_EDEFAULT.equals(materialId);
 		case BuildingPhysicsPackage.MATERIAL__NAME:
 			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
 		case BuildingPhysicsPackage.MATERIAL__DENSITY:
@@ -726,8 +727,8 @@ public class MaterialImpl extends MinimalEObjectImpl.Container implements Materi
 			return super.toString();
 
 		StringBuilder result = new StringBuilder(super.toString());
-		result.append(" (id: ");
-		result.append(id);
+		result.append(" (materialId: ");
+		result.append(materialId);
 		result.append(", name: ");
 		result.append(name);
 		result.append(", density: ");

de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/MountingImpl.java

+/**
+ */
+package de.hftstuttgart.buildingphysics.impl;
+
+import de.hftstuttgart.buildingphysics.BuildingPhysicsPackage;
+import de.hftstuttgart.buildingphysics.Layer;
+import de.hftstuttgart.buildingphysics.Mounting;
+
+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.InternalEList;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Mounting</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link de.hftstuttgart.buildingphysics.impl.MountingImpl#getMountingId <em>Mounting Id</em>}</li>
+ *   <li>{@link de.hftstuttgart.buildingphysics.impl.MountingImpl#getName <em>Name</em>}</li>
+ *   <li>{@link de.hftstuttgart.buildingphysics.impl.MountingImpl#getLayers <em>Layers</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class MountingImpl extends MinimalEObjectImpl.Container implements Mounting {
+	/**
+	 * The default value of the '{@link #getMountingId() <em>Mounting Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMountingId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String MOUNTING_ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getMountingId() <em>Mounting Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMountingId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String mountingId = MOUNTING_ID_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String name = NAME_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getLayers() <em>Layers</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLayers()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<Layer> layers;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected MountingImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return BuildingPhysicsPackage.Literals.MOUNTING;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getMountingId() {
+		return mountingId;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setMountingId(String newMountingId) {
+		String oldMountingId = mountingId;
+		mountingId = newMountingId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, BuildingPhysicsPackage.MOUNTING__MOUNTING_ID,
+					oldMountingId, mountingId));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setName(String newName) {
+		String oldName = name;
+		name = newName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, BuildingPhysicsPackage.MOUNTING__NAME, oldName,
+					name));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<Layer> getLayers() {
+		if (layers == null) {
+			layers = new EObjectContainmentEList<Layer>(Layer.class, this, BuildingPhysicsPackage.MOUNTING__LAYERS);
+		}
+		return layers;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+		case BuildingPhysicsPackage.MOUNTING__LAYERS:
+			return ((InternalEList<?>) getLayers()).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 BuildingPhysicsPackage.MOUNTING__MOUNTING_ID:
+			return getMountingId();
+		case BuildingPhysicsPackage.MOUNTING__NAME:
+			return getName();
+		case BuildingPhysicsPackage.MOUNTING__LAYERS:
+			return getLayers();
+		}
+		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 BuildingPhysicsPackage.MOUNTING__MOUNTING_ID:
+			setMountingId((String) newValue);
+			return;
+		case BuildingPhysicsPackage.MOUNTING__NAME:
+			setName((String) newValue);
+			return;
+		case BuildingPhysicsPackage.MOUNTING__LAYERS:
+			getLayers().clear();
+			getLayers().addAll((Collection<? extends Layer>) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case BuildingPhysicsPackage.MOUNTING__MOUNTING_ID:
+			setMountingId(MOUNTING_ID_EDEFAULT);
+			return;
+		case BuildingPhysicsPackage.MOUNTING__NAME:
+			setName(NAME_EDEFAULT);
+			return;
+		case BuildingPhysicsPackage.MOUNTING__LAYERS:
+			getLayers().clear();
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case BuildingPhysicsPackage.MOUNTING__MOUNTING_ID:
+			return MOUNTING_ID_EDEFAULT == null ? mountingId != null : !MOUNTING_ID_EDEFAULT.equals(mountingId);
+		case BuildingPhysicsPackage.MOUNTING__NAME:
+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+		case BuildingPhysicsPackage.MOUNTING__LAYERS:
+			return layers != null && !layers.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy())
+			return super.toString();
+
+		StringBuilder result = new StringBuilder(super.toString());
+		result.append(" (mountingId: ");
+		result.append(mountingId);
+		result.append(", name: ");
+		result.append(name);
+		result.append(')');
+		return result.toString();
+	}
+
+} //MountingImpl

de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/WindowTypeImpl.java

@@ -25,7 +25,7 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link de.hftstuttgart.buildingphysics.impl.WindowTypeImpl#getId <em>Id</em>}</li>
+ *   <li>{@link de.hftstuttgart.buildingphysics.impl.WindowTypeImpl#getWindowTypeId <em>Window Type Id</em>}</li>
  *   <li>{@link de.hftstuttgart.buildingphysics.impl.WindowTypeImpl#getName <em>Name</em>}</li>
  *   <li>{@link de.hftstuttgart.buildingphysics.impl.WindowTypeImpl#getUValue <em>UValue</em>}</li>
  *   <li>{@link de.hftstuttgart.buildingphysics.impl.WindowTypeImpl#getGValue <em>GValue</em>}</li>
@@ -43,24 +43,24 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  */
 public class WindowTypeImpl extends MinimalEObjectImpl.Container implements WindowType {
 	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
+	 * The default value of the '{@link #getWindowTypeId() <em>Window Type Id</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getId()
+	 * @see #getWindowTypeId()
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int ID_EDEFAULT = 0;
+	protected static final String WINDOW_TYPE_ID_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
+	 * The cached value of the '{@link #getWindowTypeId() <em>Window Type Id</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getId()
+	 * @see #getWindowTypeId()
 	 * @generated
 	 * @ordered
 	 */
-	protected int id = ID_EDEFAULT;
+	protected String windowTypeId = WINDOW_TYPE_ID_EDEFAULT;
 
 	/**
 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
@@ -312,8 +312,8 @@ public class WindowTypeImpl extends MinimalEObjectImpl.Container implements Wind
 	 * @generated
 	 */
 	@Override
-	public int getId() {
-		return id;
+	public String getWindowTypeId() {
+		return windowTypeId;
 	}
 
 	/**
@@ -322,11 +322,12 @@ public class WindowTypeImpl extends MinimalEObjectImpl.Container implements Wind
 	 * @generated
 	 */
 	@Override
-	public void setId(int newId) {
-		int oldId = id;
-		id = newId;
+	public void setWindowTypeId(String newWindowTypeId) {
+		String oldWindowTypeId = windowTypeId;
+		windowTypeId = newWindowTypeId;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildingPhysicsPackage.WINDOW_TYPE__ID, oldId, id));
+			eNotify(new ENotificationImpl(this, Notification.SET, BuildingPhysicsPackage.WINDOW_TYPE__WINDOW_TYPE_ID,
+					oldWindowTypeId, windowTypeId));
 	}
 
 	/**
@@ -603,8 +604,8 @@ public class WindowTypeImpl extends MinimalEObjectImpl.Container implements Wind
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case BuildingPhysicsPackage.WINDOW_TYPE__ID:
-			return getId();
+		case BuildingPhysicsPackage.WINDOW_TYPE__WINDOW_TYPE_ID:
+			return getWindowTypeId();
 		case BuildingPhysicsPackage.WINDOW_TYPE__NAME:
 			return getName();
 		case BuildingPhysicsPackage.WINDOW_TYPE__UVALUE:
@@ -639,8 +640,8 @@ public class WindowTypeImpl extends MinimalEObjectImpl.Container implements Wind
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case BuildingPhysicsPackage.WINDOW_TYPE__ID:
-			setId((Integer) newValue);
+		case BuildingPhysicsPackage.WINDOW_TYPE__WINDOW_TYPE_ID:
+			setWindowTypeId((String) newValue);
 			return;
 		case BuildingPhysicsPackage.WINDOW_TYPE__NAME:
 			setName((String) newValue);
@@ -687,8 +688,8 @@ public class WindowTypeImpl extends MinimalEObjectImpl.Container implements Wind
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case BuildingPhysicsPackage.WINDOW_TYPE__ID:
-			setId(ID_EDEFAULT);
+		case BuildingPhysicsPackage.WINDOW_TYPE__WINDOW_TYPE_ID:
+			setWindowTypeId(WINDOW_TYPE_ID_EDEFAULT);
 			return;
 		case BuildingPhysicsPackage.WINDOW_TYPE__NAME:
 			setName(NAME_EDEFAULT);
@@ -735,8 +736,9 @@ public class WindowTypeImpl extends MinimalEObjectImpl.Container implements Wind
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case BuildingPhysicsPackage.WINDOW_TYPE__ID:
-			return id != ID_EDEFAULT;
+		case BuildingPhysicsPackage.WINDOW_TYPE__WINDOW_TYPE_ID:
+			return WINDOW_TYPE_ID_EDEFAULT == null ? windowTypeId != null
+					: !WINDOW_TYPE_ID_EDEFAULT.equals(windowTypeId);
 		case BuildingPhysicsPackage.WINDOW_TYPE__NAME:
 			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
 		case BuildingPhysicsPackage.WINDOW_TYPE__UVALUE:
@@ -780,8 +782,8 @@ public class WindowTypeImpl extends MinimalEObjectImpl.Container implements Wind
 			return super.toString();
 
 		StringBuilder result = new StringBuilder(super.toString());
-		result.append(" (id: ");
-		result.append(id);
+		result.append(" (windowTypeId: ");
+		result.append(windowTypeId);
 		result.append(", name: ");
 		result.append(name);
 		result.append(", uValue: ");

de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/util/BuildingPhysicsAdapterFactory.java

@@ -101,6 +101,21 @@ public class BuildingPhysicsAdapterFactory extends AdapterFactoryImpl {
 			return createMaterialAdapter();
 		}
 
+		@Override
+		public Adapter caseConstructionCategory(ConstructionCategory object) {
+			return createConstructionCategoryAdapter();
+		}
+
+		@Override
+		public Adapter caseMounting(Mounting object) {
+			return createMountingAdapter();
+		}
+
+		@Override
+		public Adapter caseLayer(Layer object) {
+			return createLayerAdapter();
+		}
+
 		@Override
 		public Adapter defaultCase(EObject object) {
 			return createEObjectAdapter();
@@ -218,6 +233,48 @@ public class BuildingPhysicsAdapterFactory extends AdapterFactoryImpl {
 		return null;
 	}
 
+	/**
+	 * Creates a new adapter for an object of class '{@link de.hftstuttgart.buildingphysics.ConstructionCategory <em>Construction Category</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see de.hftstuttgart.buildingphysics.ConstructionCategory
+	 * @generated
+	 */
+	public Adapter createConstructionCategoryAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link de.hftstuttgart.buildingphysics.Mounting <em>Mounting</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see de.hftstuttgart.buildingphysics.Mounting
+	 * @generated
+	 */
+	public Adapter createMountingAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link de.hftstuttgart.buildingphysics.Layer <em>Layer</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see de.hftstuttgart.buildingphysics.Layer
+	 * @generated
+	 */
+	public Adapter createLayerAdapter() {
+		return null;
+	}
+
 	/**
 	 * Creates a new adapter for the default case.
 	 * <!-- begin-user-doc -->

de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/util/BuildingPhysicsSwitch.java

@@ -119,6 +119,27 @@ public class BuildingPhysicsSwitch<T> extends Switch<T> {
 				result = defaultCase(theEObject);
 			return result;
 		}
+		case BuildingPhysicsPackage.CONSTRUCTION_CATEGORY: {
+			ConstructionCategory constructionCategory = (ConstructionCategory) theEObject;
+			T result = caseConstructionCategory(constructionCategory);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case BuildingPhysicsPackage.MOUNTING: {
+			Mounting mounting = (Mounting) theEObject;
+			T result = caseMounting(mounting);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case BuildingPhysicsPackage.LAYER: {
+			Layer layer = (Layer) theEObject;
+			T result = caseLayer(layer);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
 		default:
 			return defaultCase(theEObject);
 		}
@@ -229,6 +250,51 @@ public class BuildingPhysicsSwitch<T> extends Switch<T> {
 		return null;
 	}
 
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Construction Category</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Construction Category</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseConstructionCategory(ConstructionCategory object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Mounting</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Mounting</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseMounting(Mounting object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Layer</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Layer</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseLayer(Layer object) {
+		return null;
+	}
+
 	/**
 	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
 	 * <!-- begin-user-doc -->