de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/BuildingPhysicsPackage.java

@@ -176,13 +176,58 @@ public interface BuildingPhysicsPackage extends EPackage {
 	int WINDOW_TYPE__FRAME_RATIO = 5;
 
 	/**
-	 * The feature id for the '<em><b>Life Cycle</b></em>' containment reference.
+	 * The feature id for the '<em><b>Embodied Energy</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int WINDOW_TYPE__EMBODIED_ENERGY = 6;
+
+	/**
+	 * The feature id for the '<em><b>Embodied Carbon</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int WINDOW_TYPE__EMBODIED_CARBON = 7;
+
+	/**
+	 * The feature id for the '<em><b>Construction Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int WINDOW_TYPE__CONSTRUCTION_DESCRIPTION = 8;
+
+	/**
+	 * The feature id for the '<em><b>Disposal Energy</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int WINDOW_TYPE__DISPOSAL_ENERGY = 9;
+
+	/**
+	 * The feature id for the '<em><b>Disposal Carbon</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int WINDOW_TYPE__DISPOSAL_CARBON = 10;
+
+	/**
+	 * The feature id for the '<em><b>Disposal Description</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int WINDOW_TYPE__LIFE_CYCLE = 6;
+	int WINDOW_TYPE__DISPOSAL_DESCRIPTION = 11;
 
 	/**
 	 * The number of structural features of the '<em>Window Type</em>' class.
@@ -191,7 +236,7 @@ public interface BuildingPhysicsPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int WINDOW_TYPE_FEATURE_COUNT = 7;
+	int WINDOW_TYPE_FEATURE_COUNT = 12;
 
 	/**
 	 * The number of operations of the '<em>Window Type</em>' class.
@@ -486,34 +531,6 @@ public interface BuildingPhysicsPackage extends EPackage {
 	 */
 	int MATERIAL__CONDUCTIVITY = 4;
 
-	/**
-	 * The number of structural features of the '<em>Material</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MATERIAL_FEATURE_COUNT = 5;
-
-	/**
-	 * The number of operations of the '<em>Material</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MATERIAL_OPERATION_COUNT = 0;
-
-	/**
-	 * The meta object id for the '{@link de.hftstuttgart.buildingphysics.impl.LifeCycleImpl <em>Life Cycle</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see de.hftstuttgart.buildingphysics.impl.LifeCycleImpl
-	 * @see de.hftstuttgart.buildingphysics.impl.BuildingPhysicsPackageImpl#getLifeCycle()
-	 * @generated
-	 */
-	int LIFE_CYCLE = 7;
-
 	/**
 	 * The feature id for the '<em><b>Embodied Energy</b></em>' attribute.
 	 * <!-- begin-user-doc -->
@@ -521,7 +538,7 @@ public interface BuildingPhysicsPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int LIFE_CYCLE__EMBODIED_ENERGY = 0;
+	int MATERIAL__EMBODIED_ENERGY = 5;
 
 	/**
 	 * The feature id for the '<em><b>Embodied Carbon</b></em>' attribute.
@@ -530,7 +547,7 @@ public interface BuildingPhysicsPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int LIFE_CYCLE__EMBODIED_CARBON = 1;
+	int MATERIAL__EMBODIED_CARBON = 6;
 
 	/**
 	 * The feature id for the '<em><b>Construction Description</b></em>' attribute.
@@ -539,7 +556,7 @@ public interface BuildingPhysicsPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int LIFE_CYCLE__CONSTRUCTION_DESCRIPTION = 2;
+	int MATERIAL__CONSTRUCTION_DESCRIPTION = 7;
 
 	/**
 	 * The feature id for the '<em><b>Disposal Energy</b></em>' attribute.
@@ -548,7 +565,7 @@ public interface BuildingPhysicsPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int LIFE_CYCLE__DISPOSAL_ENERGY = 3;
+	int MATERIAL__DISPOSAL_ENERGY = 8;
 
 	/**
 	 * The feature id for the '<em><b>Disposal Carbon</b></em>' attribute.
@@ -557,7 +574,7 @@ public interface BuildingPhysicsPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int LIFE_CYCLE__DISPOSAL_CARBON = 4;
+	int MATERIAL__DISPOSAL_CARBON = 9;
 
 	/**
 	 * The feature id for the '<em><b>Disposal Description</b></em>' attribute.
@@ -566,25 +583,25 @@ public interface BuildingPhysicsPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int LIFE_CYCLE__DISPOSAL_DESCRIPTION = 5;
+	int MATERIAL__DISPOSAL_DESCRIPTION = 10;
 
 	/**
-	 * The number of structural features of the '<em>Life Cycle</em>' class.
+	 * The number of structural features of the '<em>Material</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int LIFE_CYCLE_FEATURE_COUNT = 6;
+	int MATERIAL_FEATURE_COUNT = 11;
 
 	/**
-	 * The number of operations of the '<em>Life Cycle</em>' class.
+	 * The number of operations of the '<em>Material</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int LIFE_CYCLE_OPERATION_COUNT = 0;
+	int MATERIAL_OPERATION_COUNT = 0;
 
 	/**
 	 * Returns the meta object for class '{@link de.hftstuttgart.buildingphysics.BuildingPhysicsCatalog <em>Catalog</em>}'.
@@ -706,15 +723,70 @@ public interface BuildingPhysicsPackage extends EPackage {
 	EAttribute getWindowType_FrameRatio();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link de.hftstuttgart.buildingphysics.WindowType#getLifeCycle <em>Life Cycle</em>}'.
+	 * Returns the meta object for the attribute '{@link de.hftstuttgart.buildingphysics.WindowType#getEmbodiedEnergy <em>Embodied Energy</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Embodied Energy</em>'.
+	 * @see de.hftstuttgart.buildingphysics.WindowType#getEmbodiedEnergy()
+	 * @see #getWindowType()
+	 * @generated
+	 */
+	EAttribute getWindowType_EmbodiedEnergy();
+
+	/**
+	 * Returns the meta object for the attribute '{@link de.hftstuttgart.buildingphysics.WindowType#getEmbodiedCarbon <em>Embodied Carbon</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Embodied Carbon</em>'.
+	 * @see de.hftstuttgart.buildingphysics.WindowType#getEmbodiedCarbon()
+	 * @see #getWindowType()
+	 * @generated
+	 */
+	EAttribute getWindowType_EmbodiedCarbon();
+
+	/**
+	 * Returns the meta object for the attribute '{@link de.hftstuttgart.buildingphysics.WindowType#getConstructionDescription <em>Construction Description</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Life Cycle</em>'.
-	 * @see de.hftstuttgart.buildingphysics.WindowType#getLifeCycle()
+	 * @return the meta object for the attribute '<em>Construction Description</em>'.
+	 * @see de.hftstuttgart.buildingphysics.WindowType#getConstructionDescription()
+	 * @see #getWindowType()
+	 * @generated
+	 */
+	EAttribute getWindowType_ConstructionDescription();
+
+	/**
+	 * Returns the meta object for the attribute '{@link de.hftstuttgart.buildingphysics.WindowType#getDisposalEnergy <em>Disposal Energy</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Disposal Energy</em>'.
+	 * @see de.hftstuttgart.buildingphysics.WindowType#getDisposalEnergy()
 	 * @see #getWindowType()
 	 * @generated
 	 */
-	EReference getWindowType_LifeCycle();
+	EAttribute getWindowType_DisposalEnergy();
+
+	/**
+	 * Returns the meta object for the attribute '{@link de.hftstuttgart.buildingphysics.WindowType#getDisposalCarbon <em>Disposal Carbon</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Disposal Carbon</em>'.
+	 * @see de.hftstuttgart.buildingphysics.WindowType#getDisposalCarbon()
+	 * @see #getWindowType()
+	 * @generated
+	 */
+	EAttribute getWindowType_DisposalCarbon();
+
+	/**
+	 * Returns the meta object for the attribute '{@link de.hftstuttgart.buildingphysics.WindowType#getDisposalDescription <em>Disposal Description</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Disposal Description</em>'.
+	 * @see de.hftstuttgart.buildingphysics.WindowType#getDisposalDescription()
+	 * @see #getWindowType()
+	 * @generated
+	 */
+	EAttribute getWindowType_DisposalDescription();
 
 	/**
 	 * Returns the meta object for class '{@link de.hftstuttgart.buildingphysics.Catalog <em>Catalog</em>}'.
@@ -899,80 +971,70 @@ public interface BuildingPhysicsPackage extends EPackage {
 	EAttribute getMaterial_Conductivity();
 
 	/**
-	 * Returns the meta object for class '{@link de.hftstuttgart.buildingphysics.LifeCycle <em>Life Cycle</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Life Cycle</em>'.
-	 * @see de.hftstuttgart.buildingphysics.LifeCycle
-	 * @generated
-	 */
-	EClass getLifeCycle();
-
-	/**
-	 * Returns the meta object for the attribute '{@link de.hftstuttgart.buildingphysics.LifeCycle#getEmbodiedEnergy <em>Embodied Energy</em>}'.
+	 * Returns the meta object for the attribute '{@link de.hftstuttgart.buildingphysics.Material#getEmbodiedEnergy <em>Embodied Energy</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Embodied Energy</em>'.
-	 * @see de.hftstuttgart.buildingphysics.LifeCycle#getEmbodiedEnergy()
-	 * @see #getLifeCycle()
+	 * @see de.hftstuttgart.buildingphysics.Material#getEmbodiedEnergy()
+	 * @see #getMaterial()
 	 * @generated
 	 */
-	EAttribute getLifeCycle_EmbodiedEnergy();
+	EAttribute getMaterial_EmbodiedEnergy();
 
 	/**
-	 * Returns the meta object for the attribute '{@link de.hftstuttgart.buildingphysics.LifeCycle#getEmbodiedCarbon <em>Embodied Carbon</em>}'.
+	 * Returns the meta object for the attribute '{@link de.hftstuttgart.buildingphysics.Material#getEmbodiedCarbon <em>Embodied Carbon</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Embodied Carbon</em>'.
-	 * @see de.hftstuttgart.buildingphysics.LifeCycle#getEmbodiedCarbon()
-	 * @see #getLifeCycle()
+	 * @see de.hftstuttgart.buildingphysics.Material#getEmbodiedCarbon()
+	 * @see #getMaterial()
 	 * @generated
 	 */
-	EAttribute getLifeCycle_EmbodiedCarbon();
+	EAttribute getMaterial_EmbodiedCarbon();
 
 	/**
-	 * Returns the meta object for the attribute '{@link de.hftstuttgart.buildingphysics.LifeCycle#getConstructionDescription <em>Construction Description</em>}'.
+	 * Returns the meta object for the attribute '{@link de.hftstuttgart.buildingphysics.Material#getConstructionDescription <em>Construction Description</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Construction Description</em>'.
-	 * @see de.hftstuttgart.buildingphysics.LifeCycle#getConstructionDescription()
-	 * @see #getLifeCycle()
+	 * @see de.hftstuttgart.buildingphysics.Material#getConstructionDescription()
+	 * @see #getMaterial()
 	 * @generated
 	 */
-	EAttribute getLifeCycle_ConstructionDescription();
+	EAttribute getMaterial_ConstructionDescription();
 
 	/**
-	 * Returns the meta object for the attribute '{@link de.hftstuttgart.buildingphysics.LifeCycle#getDisposalEnergy <em>Disposal Energy</em>}'.
+	 * Returns the meta object for the attribute '{@link de.hftstuttgart.buildingphysics.Material#getDisposalEnergy <em>Disposal Energy</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Disposal Energy</em>'.
-	 * @see de.hftstuttgart.buildingphysics.LifeCycle#getDisposalEnergy()
-	 * @see #getLifeCycle()
+	 * @see de.hftstuttgart.buildingphysics.Material#getDisposalEnergy()
+	 * @see #getMaterial()
 	 * @generated
 	 */
-	EAttribute getLifeCycle_DisposalEnergy();
+	EAttribute getMaterial_DisposalEnergy();
 
 	/**
-	 * Returns the meta object for the attribute '{@link de.hftstuttgart.buildingphysics.LifeCycle#getDisposalCarbon <em>Disposal Carbon</em>}'.
+	 * Returns the meta object for the attribute '{@link de.hftstuttgart.buildingphysics.Material#getDisposalCarbon <em>Disposal Carbon</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Disposal Carbon</em>'.
-	 * @see de.hftstuttgart.buildingphysics.LifeCycle#getDisposalCarbon()
-	 * @see #getLifeCycle()
+	 * @see de.hftstuttgart.buildingphysics.Material#getDisposalCarbon()
+	 * @see #getMaterial()
 	 * @generated
 	 */
-	EAttribute getLifeCycle_DisposalCarbon();
+	EAttribute getMaterial_DisposalCarbon();
 
 	/**
-	 * Returns the meta object for the attribute '{@link de.hftstuttgart.buildingphysics.LifeCycle#getDisposalDescription <em>Disposal Description</em>}'.
+	 * Returns the meta object for the attribute '{@link de.hftstuttgart.buildingphysics.Material#getDisposalDescription <em>Disposal Description</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Disposal Description</em>'.
-	 * @see de.hftstuttgart.buildingphysics.LifeCycle#getDisposalDescription()
-	 * @see #getLifeCycle()
+	 * @see de.hftstuttgart.buildingphysics.Material#getDisposalDescription()
+	 * @see #getMaterial()
 	 * @generated
 	 */
-	EAttribute getLifeCycle_DisposalDescription();
+	EAttribute getMaterial_DisposalDescription();
 
 	/**
 	 * Returns the factory that creates the instances of the model.
@@ -1090,12 +1152,52 @@ public interface BuildingPhysicsPackage extends EPackage {
 		EAttribute WINDOW_TYPE__FRAME_RATIO = eINSTANCE.getWindowType_FrameRatio();
 
 		/**
-		 * The meta object literal for the '<em><b>Life Cycle</b></em>' containment reference feature.
+		 * The meta object literal for the '<em><b>Embodied Energy</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference WINDOW_TYPE__LIFE_CYCLE = eINSTANCE.getWindowType_LifeCycle();
+		EAttribute WINDOW_TYPE__EMBODIED_ENERGY = eINSTANCE.getWindowType_EmbodiedEnergy();
+
+		/**
+		 * The meta object literal for the '<em><b>Embodied Carbon</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute WINDOW_TYPE__EMBODIED_CARBON = eINSTANCE.getWindowType_EmbodiedCarbon();
+
+		/**
+		 * The meta object literal for the '<em><b>Construction Description</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute WINDOW_TYPE__CONSTRUCTION_DESCRIPTION = eINSTANCE.getWindowType_ConstructionDescription();
+
+		/**
+		 * The meta object literal for the '<em><b>Disposal Energy</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute WINDOW_TYPE__DISPOSAL_ENERGY = eINSTANCE.getWindowType_DisposalEnergy();
+
+		/**
+		 * The meta object literal for the '<em><b>Disposal Carbon</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute WINDOW_TYPE__DISPOSAL_CARBON = eINSTANCE.getWindowType_DisposalCarbon();
+
+		/**
+		 * The meta object literal for the '<em><b>Disposal Description</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute WINDOW_TYPE__DISPOSAL_DESCRIPTION = eINSTANCE.getWindowType_DisposalDescription();
 
 		/**
 		 * The meta object literal for the '{@link de.hftstuttgart.buildingphysics.impl.CatalogImpl <em>Catalog</em>}' class.
@@ -1243,23 +1345,13 @@ public interface BuildingPhysicsPackage extends EPackage {
 		 */
 		EAttribute MATERIAL__CONDUCTIVITY = eINSTANCE.getMaterial_Conductivity();
 
-		/**
-		 * The meta object literal for the '{@link de.hftstuttgart.buildingphysics.impl.LifeCycleImpl <em>Life Cycle</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see de.hftstuttgart.buildingphysics.impl.LifeCycleImpl
-		 * @see de.hftstuttgart.buildingphysics.impl.BuildingPhysicsPackageImpl#getLifeCycle()
-		 * @generated
-		 */
-		EClass LIFE_CYCLE = eINSTANCE.getLifeCycle();
-
 		/**
 		 * The meta object literal for the '<em><b>Embodied Energy</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute LIFE_CYCLE__EMBODIED_ENERGY = eINSTANCE.getLifeCycle_EmbodiedEnergy();
+		EAttribute MATERIAL__EMBODIED_ENERGY = eINSTANCE.getMaterial_EmbodiedEnergy();
 
 		/**
 		 * The meta object literal for the '<em><b>Embodied Carbon</b></em>' attribute feature.
@@ -1267,7 +1359,7 @@ public interface BuildingPhysicsPackage extends EPackage {
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute LIFE_CYCLE__EMBODIED_CARBON = eINSTANCE.getLifeCycle_EmbodiedCarbon();
+		EAttribute MATERIAL__EMBODIED_CARBON = eINSTANCE.getMaterial_EmbodiedCarbon();
 
 		/**
 		 * The meta object literal for the '<em><b>Construction Description</b></em>' attribute feature.
@@ -1275,7 +1367,7 @@ public interface BuildingPhysicsPackage extends EPackage {
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute LIFE_CYCLE__CONSTRUCTION_DESCRIPTION = eINSTANCE.getLifeCycle_ConstructionDescription();
+		EAttribute MATERIAL__CONSTRUCTION_DESCRIPTION = eINSTANCE.getMaterial_ConstructionDescription();
 
 		/**
 		 * The meta object literal for the '<em><b>Disposal Energy</b></em>' attribute feature.
@@ -1283,7 +1375,7 @@ public interface BuildingPhysicsPackage extends EPackage {
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute LIFE_CYCLE__DISPOSAL_ENERGY = eINSTANCE.getLifeCycle_DisposalEnergy();
+		EAttribute MATERIAL__DISPOSAL_ENERGY = eINSTANCE.getMaterial_DisposalEnergy();
 
 		/**
 		 * The meta object literal for the '<em><b>Disposal Carbon</b></em>' attribute feature.
@@ -1291,7 +1383,7 @@ public interface BuildingPhysicsPackage extends EPackage {
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute LIFE_CYCLE__DISPOSAL_CARBON = eINSTANCE.getLifeCycle_DisposalCarbon();
+		EAttribute MATERIAL__DISPOSAL_CARBON = eINSTANCE.getMaterial_DisposalCarbon();
 
 		/**
 		 * The meta object literal for the '<em><b>Disposal Description</b></em>' attribute feature.
@@ -1299,7 +1391,7 @@ public interface BuildingPhysicsPackage extends EPackage {
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute LIFE_CYCLE__DISPOSAL_DESCRIPTION = eINSTANCE.getLifeCycle_DisposalDescription();
+		EAttribute MATERIAL__DISPOSAL_DESCRIPTION = eINSTANCE.getMaterial_DisposalDescription();
 
 	}
 

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

@@ -30,13 +30,13 @@ import org.eclipse.emf.ecore.EObject;
 public interface LifeCycle extends EObject {
 	/**
 	 * Returns the value of the '<em><b>Embodied Energy</b></em>' attribute.
-	 * The default value is <code>"kWh"</code>.
+	 * 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="kWh" dataType="de.hftstuttgart.cityunits.model.quantities.QuantityDouble" required="true"
+	 * @model default="kW*h" dataType="de.hftstuttgart.cityunits.model.quantities.QuantityDouble" required="true"
 	 * @generated
 	 */
 	NullableQuantity getEmbodiedEnergy();
@@ -98,13 +98,13 @@ public interface LifeCycle extends EObject {
 
 	/**
 	 * Returns the value of the '<em><b>Disposal Energy</b></em>' attribute.
-	 * The default value is <code>"kWh"</code>.
+	 * 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="kWh" dataType="de.hftstuttgart.cityunits.model.quantities.QuantityDouble" required="true"
+	 * @model default="kW*h" dataType="de.hftstuttgart.cityunits.model.quantities.QuantityDouble" required="true"
 	 * @generated
 	 */
 	NullableQuantity getDisposalEnergy();

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

@@ -20,6 +20,12 @@ import org.eclipse.emf.ecore.EObject;
  *   <li>{@link de.hftstuttgart.buildingphysics.Material#getDensity <em>Density</em>}</li>
  *   <li>{@link de.hftstuttgart.buildingphysics.Material#getHeatCapacity <em>Heat Capacity</em>}</li>
  *   <li>{@link de.hftstuttgart.buildingphysics.Material#getConductivity <em>Conductivity</em>}</li>
+ *   <li>{@link de.hftstuttgart.buildingphysics.Material#getEmbodiedEnergy <em>Embodied Energy</em>}</li>
+ *   <li>{@link de.hftstuttgart.buildingphysics.Material#getEmbodiedCarbon <em>Embodied Carbon</em>}</li>
+ *   <li>{@link de.hftstuttgart.buildingphysics.Material#getConstructionDescription <em>Construction Description</em>}</li>
+ *   <li>{@link de.hftstuttgart.buildingphysics.Material#getDisposalEnergy <em>Disposal Energy</em>}</li>
+ *   <li>{@link de.hftstuttgart.buildingphysics.Material#getDisposalCarbon <em>Disposal Carbon</em>}</li>
+ *   <li>{@link de.hftstuttgart.buildingphysics.Material#getDisposalDescription <em>Disposal Description</em>}</li>
  * </ul>
  *
  * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getMaterial()
@@ -32,12 +38,12 @@ public interface Material extends EObject {
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(int)
+	 * @see #setId(long)
 	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getMaterial_Id()
 	 * @model id="true" required="true"
 	 * @generated
 	 */
-	int getId();
+	long getId();
 
 	/**
 	 * Sets the value of the '{@link de.hftstuttgart.buildingphysics.Material#getId <em>Id</em>}' attribute.
@@ -47,7 +53,7 @@ public interface Material extends EObject {
 	 * @see #getId()
 	 * @generated
 	 */
-	void setId(int value);
+	void setId(long value);
 
 	/**
 	 * Returns the value of the '<em><b>Name</b></em>' attribute.
@@ -73,15 +79,16 @@ public interface Material extends EObject {
 
 	/**
 	 * Returns the value of the '<em><b>Density</b></em>' attribute.
+	 * The default value is <code>"kg/m\u00b3"</code>.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Density</em>' attribute.
-	 * @see #setDensity(double)
+	 * @see #setDensity(NullableQuantity)
 	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getMaterial_Density()
-	 * @model required="true"
+	 * @model default="kg/m\u00b3" dataType="de.hftstuttgart.cityunits.model.quantities.QuantityDouble" required="true"
 	 * @generated
 	 */
-	double getDensity();
+	NullableQuantity getDensity();
 
 	/**
 	 * Sets the value of the '{@link de.hftstuttgart.buildingphysics.Material#getDensity <em>Density</em>}' attribute.
@@ -91,7 +98,7 @@ public interface Material extends EObject {
 	 * @see #getDensity()
 	 * @generated
 	 */
-	void setDensity(double value);
+	void setDensity(NullableQuantity value);
 
 	/**
 	 * Returns the value of the '<em><b>Heat Capacity</b></em>' attribute.
@@ -118,15 +125,16 @@ public interface Material extends EObject {
 
 	/**
 	 * Returns the value of the '<em><b>Conductivity</b></em>' attribute.
+	 * The default value is <code>"W/(m*K)"</code>.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Conductivity</em>' attribute.
-	 * @see #setConductivity(double)
+	 * @see #setConductivity(NullableQuantity)
 	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getMaterial_Conductivity()
-	 * @model required="true"
+	 * @model default="W/(m*K)" dataType="de.hftstuttgart.cityunits.model.quantities.QuantityDouble" required="true"
 	 * @generated
 	 */
-	double getConductivity();
+	NullableQuantity getConductivity();
 
 	/**
 	 * Sets the value of the '{@link de.hftstuttgart.buildingphysics.Material#getConductivity <em>Conductivity</em>}' attribute.
@@ -136,6 +144,142 @@ public interface Material extends EObject {
 	 * @see #getConductivity()
 	 * @generated
 	 */
-	void setConductivity(double value);
+	void setConductivity(NullableQuantity value);
+
+	/**
+	 * Returns the value of the '<em><b>Embodied Energy</b></em>' attribute.
+	 * The default value is <code>"kW*h/kg"</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#getMaterial_EmbodiedEnergy()
+	 * @model default="kW*h/kg" dataType="de.hftstuttgart.cityunits.model.quantities.QuantityDouble" required="true"
+	 * @generated
+	 */
+	NullableQuantity getEmbodiedEnergy();
+
+	/**
+	 * Sets the value of the '{@link de.hftstuttgart.buildingphysics.Material#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#getMaterial_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.Material#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#getMaterial_ConstructionDescription()
+	 * @model required="true"
+	 * @generated
+	 */
+	String getConstructionDescription();
+
+	/**
+	 * Sets the value of the '{@link de.hftstuttgart.buildingphysics.Material#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/kg"</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#getMaterial_DisposalEnergy()
+	 * @model default="kW*h/kg" dataType="de.hftstuttgart.cityunits.model.quantities.QuantityDouble" required="true"
+	 * @generated
+	 */
+	NullableQuantity getDisposalEnergy();
+
+	/**
+	 * Sets the value of the '{@link de.hftstuttgart.buildingphysics.Material#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#getMaterial_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.Material#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#getMaterial_DisposalDescription()
+	 * @model required="true"
+	 * @generated
+	 */
+	String getDisposalDescription();
+
+	/**
+	 * Sets the value of the '{@link de.hftstuttgart.buildingphysics.Material#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);
 
 } // Material

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

@@ -20,7 +20,12 @@ import org.eclipse.emf.ecore.EObject;
  *   <li>{@link de.hftstuttgart.buildingphysics.WindowType#getGValue <em>GValue</em>}</li>
  *   <li>{@link de.hftstuttgart.buildingphysics.WindowType#getGlazingNumber <em>Glazing Number</em>}</li>
  *   <li>{@link de.hftstuttgart.buildingphysics.WindowType#getFrameRatio <em>Frame Ratio</em>}</li>
- *   <li>{@link de.hftstuttgart.buildingphysics.WindowType#getLifeCycle <em>Life Cycle</em>}</li>
+ *   <li>{@link de.hftstuttgart.buildingphysics.WindowType#getEmbodiedEnergy <em>Embodied Energy</em>}</li>
+ *   <li>{@link de.hftstuttgart.buildingphysics.WindowType#getEmbodiedCarbon <em>Embodied Carbon</em>}</li>
+ *   <li>{@link de.hftstuttgart.buildingphysics.WindowType#getConstructionDescription <em>Construction Description</em>}</li>
+ *   <li>{@link de.hftstuttgart.buildingphysics.WindowType#getDisposalEnergy <em>Disposal Energy</em>}</li>
+ *   <li>{@link de.hftstuttgart.buildingphysics.WindowType#getDisposalCarbon <em>Disposal Carbon</em>}</li>
+ *   <li>{@link de.hftstuttgart.buildingphysics.WindowType#getDisposalDescription <em>Disposal Description</em>}</li>
  * </ul>
  *
  * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getWindowType()
@@ -74,13 +79,13 @@ public interface WindowType extends EObject {
 
 	/**
 	 * Returns the value of the '<em><b>UValue</b></em>' attribute.
-	 * The default value is <code>"W/(m\u00b2\u00b7K)"</code>.
+	 * The default value is <code>"W/(m\u00b2*K)"</code>.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>UValue</em>' attribute.
 	 * @see #setUValue(NullableQuantity)
 	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getWindowType_UValue()
-	 * @model default="W/(m\u00b2\u00b7K)" dataType="de.hftstuttgart.cityunits.model.quantities.QuantityDouble" required="true"
+	 * @model default="W/(m\u00b2*K)" dataType="de.hftstuttgart.cityunits.model.quantities.QuantityDouble" required="true"
 	 * @generated
 	 */
 	NullableQuantity getUValue();
@@ -99,6 +104,9 @@ public interface WindowType extends EObject {
 	 * Returns the value of the '<em><b>GValue</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * coefficient between 0.0 (window with no solar energy transmittance) and 1.0 (full transmittance of all solar radiation)
+	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>GValue</em>' attribute.
 	 * @see #setGValue(double)
 	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getWindowType_GValue()
@@ -145,15 +153,15 @@ public interface WindowType extends EObject {
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * <!-- begin-model-doc -->
-	 * In % (between 0 and 100)
+	 * fraction between 0.0 and 1.0
 	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Frame Ratio</em>' attribute.
-	 * @see #setFrameRatio(int)
+	 * @see #setFrameRatio(double)
 	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getWindowType_FrameRatio()
 	 * @model required="true"
 	 * @generated
 	 */
-	int getFrameRatio();
+	double getFrameRatio();
 
 	/**
 	 * Sets the value of the '{@link de.hftstuttgart.buildingphysics.WindowType#getFrameRatio <em>Frame Ratio</em>}' attribute.
@@ -163,28 +171,142 @@ public interface WindowType extends EObject {
 	 * @see #getFrameRatio()
 	 * @generated
 	 */
-	void setFrameRatio(int value);
+	void setFrameRatio(double value);
+
+	/**
+	 * Returns the value of the '<em><b>Embodied Energy</b></em>' attribute.
+	 * The default value is <code>"kW*h/m\u00b2"</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#getWindowType_EmbodiedEnergy()
+	 * @model default="kW*h/m\u00b2" dataType="de.hftstuttgart.cityunits.model.quantities.QuantityDouble" required="true"
+	 * @generated
+	 */
+	NullableQuantity getEmbodiedEnergy();
+
+	/**
+	 * Sets the value of the '{@link de.hftstuttgart.buildingphysics.WindowType#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#getWindowType_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.WindowType#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#getWindowType_ConstructionDescription()
+	 * @model required="true"
+	 * @generated
+	 */
+	String getConstructionDescription();
+
+	/**
+	 * Sets the value of the '{@link de.hftstuttgart.buildingphysics.WindowType#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/m\u00b2"</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#getWindowType_DisposalEnergy()
+	 * @model default="kW*h/m\u00b2" dataType="de.hftstuttgart.cityunits.model.quantities.QuantityDouble" required="true"
+	 * @generated
+	 */
+	NullableQuantity getDisposalEnergy();
+
+	/**
+	 * Sets the value of the '{@link de.hftstuttgart.buildingphysics.WindowType#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#getWindowType_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.WindowType#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>Life Cycle</b></em>' containment reference.
+	 * Returns the value of the '<em><b>Disposal Description</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Life Cycle</em>' containment reference.
-	 * @see #setLifeCycle(LifeCycle)
-	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getWindowType_LifeCycle()
-	 * @model containment="true"
+	 * @return the value of the '<em>Disposal Description</em>' attribute.
+	 * @see #setDisposalDescription(String)
+	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getWindowType_DisposalDescription()
+	 * @model required="true"
 	 * @generated
 	 */
-	LifeCycle getLifeCycle();
+	String getDisposalDescription();
 
 	/**
-	 * Sets the value of the '{@link de.hftstuttgart.buildingphysics.WindowType#getLifeCycle <em>Life Cycle</em>}' containment reference.
+	 * Sets the value of the '{@link de.hftstuttgart.buildingphysics.WindowType#getDisposalDescription <em>Disposal Description</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Life Cycle</em>' containment reference.
-	 * @see #getLifeCycle()
+	 * @param value the new value of the '<em>Disposal Description</em>' attribute.
+	 * @see #getDisposalDescription()
 	 * @generated
 	 */
-	void setLifeCycle(LifeCycle value);
+	void setDisposalDescription(String value);
 
 } // WindowType

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

@@ -68,8 +68,6 @@ public class BuildingPhysicsFactoryImpl extends EFactoryImpl implements Building
 			return createMaterialCategory();
 		case BuildingPhysicsPackage.MATERIAL:
 			return createMaterial();
-		case BuildingPhysicsPackage.LIFE_CYCLE:
-			return createLifeCycle();
 		default:
 			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
 		}
@@ -141,17 +139,6 @@ public class BuildingPhysicsFactoryImpl extends EFactoryImpl implements Building
 		return material;
 	}
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public LifeCycle createLifeCycle() {
-		LifeCycleImpl lifeCycle = new LifeCycleImpl();
-		return lifeCycle;
-	}
-
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->

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

@@ -6,7 +6,6 @@ import de.hftstuttgart.buildingphysics.BuildingPhysicsCatalog;
 import de.hftstuttgart.buildingphysics.BuildingPhysicsFactory;
 import de.hftstuttgart.buildingphysics.BuildingPhysicsPackage;
 import de.hftstuttgart.buildingphysics.Catalog;
-import de.hftstuttgart.buildingphysics.LifeCycle;
 import de.hftstuttgart.buildingphysics.Material;
 import de.hftstuttgart.buildingphysics.MaterialCatalog;
 import de.hftstuttgart.buildingphysics.MaterialCategory;
@@ -78,13 +77,6 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
 	 */
 	private EClass materialEClass = null;
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass lifeCycleEClass = null;
-
 	/**
 	 * Creates an instance of the model <b>Package</b>, registered with
 	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
@@ -268,8 +260,58 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
 	 * @generated
 	 */
 	@Override
-	public EReference getWindowType_LifeCycle() {
-		return (EReference) windowTypeEClass.getEStructuralFeatures().get(6);
+	public EAttribute getWindowType_EmbodiedEnergy() {
+		return (EAttribute) windowTypeEClass.getEStructuralFeatures().get(6);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getWindowType_EmbodiedCarbon() {
+		return (EAttribute) windowTypeEClass.getEStructuralFeatures().get(7);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getWindowType_ConstructionDescription() {
+		return (EAttribute) windowTypeEClass.getEStructuralFeatures().get(8);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getWindowType_DisposalEnergy() {
+		return (EAttribute) windowTypeEClass.getEStructuralFeatures().get(9);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getWindowType_DisposalCarbon() {
+		return (EAttribute) windowTypeEClass.getEStructuralFeatures().get(10);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getWindowType_DisposalDescription() {
+		return (EAttribute) windowTypeEClass.getEStructuralFeatures().get(11);
 	}
 
 	/**
@@ -448,8 +490,8 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
 	 * @generated
 	 */
 	@Override
-	public EClass getLifeCycle() {
-		return lifeCycleEClass;
+	public EAttribute getMaterial_EmbodiedEnergy() {
+		return (EAttribute) materialEClass.getEStructuralFeatures().get(5);
 	}
 
 	/**
@@ -458,8 +500,8 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
 	 * @generated
 	 */
 	@Override
-	public EAttribute getLifeCycle_EmbodiedEnergy() {
-		return (EAttribute) lifeCycleEClass.getEStructuralFeatures().get(0);
+	public EAttribute getMaterial_EmbodiedCarbon() {
+		return (EAttribute) materialEClass.getEStructuralFeatures().get(6);
 	}
 
 	/**
@@ -468,8 +510,8 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
 	 * @generated
 	 */
 	@Override
-	public EAttribute getLifeCycle_EmbodiedCarbon() {
-		return (EAttribute) lifeCycleEClass.getEStructuralFeatures().get(1);
+	public EAttribute getMaterial_ConstructionDescription() {
+		return (EAttribute) materialEClass.getEStructuralFeatures().get(7);
 	}
 
 	/**
@@ -478,8 +520,8 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
 	 * @generated
 	 */
 	@Override
-	public EAttribute getLifeCycle_ConstructionDescription() {
-		return (EAttribute) lifeCycleEClass.getEStructuralFeatures().get(2);
+	public EAttribute getMaterial_DisposalEnergy() {
+		return (EAttribute) materialEClass.getEStructuralFeatures().get(8);
 	}
 
 	/**
@@ -488,8 +530,8 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
 	 * @generated
 	 */
 	@Override
-	public EAttribute getLifeCycle_DisposalEnergy() {
-		return (EAttribute) lifeCycleEClass.getEStructuralFeatures().get(3);
+	public EAttribute getMaterial_DisposalCarbon() {
+		return (EAttribute) materialEClass.getEStructuralFeatures().get(9);
 	}
 
 	/**
@@ -498,18 +540,8 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
 	 * @generated
 	 */
 	@Override
-	public EAttribute getLifeCycle_DisposalCarbon() {
-		return (EAttribute) lifeCycleEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EAttribute getLifeCycle_DisposalDescription() {
-		return (EAttribute) lifeCycleEClass.getEStructuralFeatures().get(5);
+	public EAttribute getMaterial_DisposalDescription() {
+		return (EAttribute) materialEClass.getEStructuralFeatures().get(10);
 	}
 
 	/**
@@ -554,7 +586,12 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
 		createEAttribute(windowTypeEClass, WINDOW_TYPE__GVALUE);
 		createEAttribute(windowTypeEClass, WINDOW_TYPE__GLAZING_NUMBER);
 		createEAttribute(windowTypeEClass, WINDOW_TYPE__FRAME_RATIO);
-		createEReference(windowTypeEClass, WINDOW_TYPE__LIFE_CYCLE);
+		createEAttribute(windowTypeEClass, WINDOW_TYPE__EMBODIED_ENERGY);
+		createEAttribute(windowTypeEClass, WINDOW_TYPE__EMBODIED_CARBON);
+		createEAttribute(windowTypeEClass, WINDOW_TYPE__CONSTRUCTION_DESCRIPTION);
+		createEAttribute(windowTypeEClass, WINDOW_TYPE__DISPOSAL_ENERGY);
+		createEAttribute(windowTypeEClass, WINDOW_TYPE__DISPOSAL_CARBON);
+		createEAttribute(windowTypeEClass, WINDOW_TYPE__DISPOSAL_DESCRIPTION);
 
 		catalogEClass = createEClass(CATALOG);
 		createEAttribute(catalogEClass, CATALOG__NAME);
@@ -577,14 +614,12 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
 		createEAttribute(materialEClass, MATERIAL__DENSITY);
 		createEAttribute(materialEClass, MATERIAL__HEAT_CAPACITY);
 		createEAttribute(materialEClass, MATERIAL__CONDUCTIVITY);
-
-		lifeCycleEClass = createEClass(LIFE_CYCLE);
-		createEAttribute(lifeCycleEClass, LIFE_CYCLE__EMBODIED_ENERGY);
-		createEAttribute(lifeCycleEClass, LIFE_CYCLE__EMBODIED_CARBON);
-		createEAttribute(lifeCycleEClass, LIFE_CYCLE__CONSTRUCTION_DESCRIPTION);
-		createEAttribute(lifeCycleEClass, LIFE_CYCLE__DISPOSAL_ENERGY);
-		createEAttribute(lifeCycleEClass, LIFE_CYCLE__DISPOSAL_CARBON);
-		createEAttribute(lifeCycleEClass, LIFE_CYCLE__DISPOSAL_DESCRIPTION);
+		createEAttribute(materialEClass, MATERIAL__EMBODIED_ENERGY);
+		createEAttribute(materialEClass, MATERIAL__EMBODIED_CARBON);
+		createEAttribute(materialEClass, MATERIAL__CONSTRUCTION_DESCRIPTION);
+		createEAttribute(materialEClass, MATERIAL__DISPOSAL_ENERGY);
+		createEAttribute(materialEClass, MATERIAL__DISPOSAL_CARBON);
+		createEAttribute(materialEClass, MATERIAL__DISPOSAL_DESCRIPTION);
 	}
 
 	/**
@@ -642,19 +677,35 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
 				!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\u00b7K)",
-				1, 1, WindowType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+		initEAttribute(getWindowType_UValue(), theQuantitiesPackage.getQuantityDouble(), "uValue", "W/(m\u00b2*K)", 1,
+				1, WindowType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
 				!IS_DERIVED, IS_ORDERED);
 		initEAttribute(getWindowType_GValue(), ecorePackage.getEDouble(), "gValue", null, 1, 1, WindowType.class,
 				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getWindowType_GlazingNumber(), ecorePackage.getEInt(), "glazingNumber", "1", 1, 1,
 				WindowType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
 				!IS_DERIVED, IS_ORDERED);
-		initEAttribute(getWindowType_FrameRatio(), ecorePackage.getEInt(), "frameRatio", null, 1, 1, WindowType.class,
-				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getWindowType_LifeCycle(), this.getLifeCycle(), null, "lifeCycle", null, 0, 1, WindowType.class,
-				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+		initEAttribute(getWindowType_FrameRatio(), ecorePackage.getEDouble(), "frameRatio", null, 1, 1,
+				WindowType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
+		initEAttribute(getWindowType_EmbodiedEnergy(), theQuantitiesPackage.getQuantityDouble(), "embodiedEnergy",
+				"kW*h/m\u00b2", 1, 1, WindowType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+				!IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getWindowType_EmbodiedCarbon(), theQuantitiesPackage.getQuantityDouble(), "embodiedCarbon", "kg",
+				1, 1, WindowType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
+		initEAttribute(getWindowType_ConstructionDescription(), ecorePackage.getEString(), "constructionDescription",
+				null, 1, 1, WindowType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
 				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getWindowType_DisposalEnergy(), theQuantitiesPackage.getQuantityDouble(), "disposalEnergy",
+				"kW*h/m\u00b2", 1, 1, WindowType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+				!IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getWindowType_DisposalCarbon(), theQuantitiesPackage.getQuantityDouble(), "disposalCarbon", "kg",
+				1, 1, WindowType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
+		initEAttribute(getWindowType_DisposalDescription(), ecorePackage.getEString(), "disposalDescription", null, 1,
+				1, WindowType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
 
 		initEClass(catalogEClass, Catalog.class, "Catalog", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getCatalog_Name(), ecorePackage.getEString(), "name", null, 1, 1, Catalog.class, !IS_TRANSIENT,
@@ -687,38 +738,36 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
 
 		initEClass(materialEClass, Material.class, "Material", !IS_ABSTRACT, !IS_INTERFACE,
 				IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getMaterial_Id(), ecorePackage.getEInt(), "id", null, 1, 1, Material.class, !IS_TRANSIENT,
+		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_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(), ecorePackage.getEDouble(), "density", null, 1, 1, Material.class,
-				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getMaterial_HeatCapacity(), theQuantitiesPackage.getQuantityDouble(), "heatCapacity", "J/K", 1,
-				1, Material.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-				!IS_DERIVED, IS_ORDERED);
-		initEAttribute(getMaterial_Conductivity(), ecorePackage.getEDouble(), "conductivity", null, 1, 1,
+		initEAttribute(getMaterial_Density(), theQuantitiesPackage.getQuantityDouble(), "density", "kg/m\u00b3", 1, 1,
 				Material.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
 				!IS_DERIVED, IS_ORDERED);
-
-		initEClass(lifeCycleEClass, LifeCycle.class, "LifeCycle", !IS_ABSTRACT, !IS_INTERFACE,
-				IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getLifeCycle_EmbodiedEnergy(), theQuantitiesPackage.getQuantityDouble(), "embodiedEnergy", "kWh",
-				1, 1, LifeCycle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+		initEAttribute(getMaterial_HeatCapacity(), theQuantitiesPackage.getQuantityDouble(), "heatCapacity", "J/K", 1,
+				1, Material.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
 				!IS_DERIVED, IS_ORDERED);
-		initEAttribute(getLifeCycle_EmbodiedCarbon(), theQuantitiesPackage.getQuantityDouble(), "embodiedCarbon", "kg",
-				1, 1, LifeCycle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+		initEAttribute(getMaterial_Conductivity(), theQuantitiesPackage.getQuantityDouble(), "conductivity", "W/(m*K)",
+				1, 1, Material.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
 				!IS_DERIVED, IS_ORDERED);
-		initEAttribute(getLifeCycle_ConstructionDescription(), ecorePackage.getEString(), "constructionDescription",
-				null, 1, 1, LifeCycle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+		initEAttribute(getMaterial_EmbodiedEnergy(), theQuantitiesPackage.getQuantityDouble(), "embodiedEnergy",
+				"kW*h/kg", 1, 1, Material.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
 				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getLifeCycle_DisposalEnergy(), theQuantitiesPackage.getQuantityDouble(), "disposalEnergy", "kWh",
-				1, 1, LifeCycle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+		initEAttribute(getMaterial_EmbodiedCarbon(), theQuantitiesPackage.getQuantityDouble(), "embodiedCarbon", "kg",
+				1, 1, Material.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
 				!IS_DERIVED, IS_ORDERED);
-		initEAttribute(getLifeCycle_DisposalCarbon(), theQuantitiesPackage.getQuantityDouble(), "disposalCarbon", "kg",
-				1, 1, LifeCycle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+		initEAttribute(getMaterial_ConstructionDescription(), ecorePackage.getEString(), "constructionDescription",
+				null, 1, 1, Material.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getMaterial_DisposalEnergy(), theQuantitiesPackage.getQuantityDouble(), "disposalEnergy",
+				"kW*h/kg", 1, 1, Material.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getMaterial_DisposalCarbon(), theQuantitiesPackage.getQuantityDouble(), "disposalCarbon", "kg",
+				1, 1, Material.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
 				!IS_DERIVED, IS_ORDERED);
-		initEAttribute(getLifeCycle_DisposalDescription(), ecorePackage.getEString(), "disposalDescription", null, 1, 1,
-				LifeCycle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+		initEAttribute(getMaterial_DisposalDescription(), ecorePackage.getEString(), "disposalDescription", null, 1, 1,
+				Material.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
 				!IS_DERIVED, IS_ORDERED);
 
 		// Create resource

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

-/**
- */
-package de.hftstuttgart.buildingphysics.impl;
-
-import de.hftstuttgart.buildingphysics.BuildingPhysicsPackage;
-import de.hftstuttgart.buildingphysics.LifeCycle;
-
-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.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Life Cycle</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link de.hftstuttgart.buildingphysics.impl.LifeCycleImpl#getEmbodiedEnergy <em>Embodied Energy</em>}</li>
- *   <li>{@link de.hftstuttgart.buildingphysics.impl.LifeCycleImpl#getEmbodiedCarbon <em>Embodied Carbon</em>}</li>
- *   <li>{@link de.hftstuttgart.buildingphysics.impl.LifeCycleImpl#getConstructionDescription <em>Construction Description</em>}</li>
- *   <li>{@link de.hftstuttgart.buildingphysics.impl.LifeCycleImpl#getDisposalEnergy <em>Disposal Energy</em>}</li>
- *   <li>{@link de.hftstuttgart.buildingphysics.impl.LifeCycleImpl#getDisposalCarbon <em>Disposal Carbon</em>}</li>
- *   <li>{@link de.hftstuttgart.buildingphysics.impl.LifeCycleImpl#getDisposalDescription <em>Disposal Description</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class LifeCycleImpl extends MinimalEObjectImpl.Container implements LifeCycle {
-	/**
-	 * The default value of the '{@link #getEmbodiedEnergy() <em>Embodied Energy</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEmbodiedEnergy()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final NullableQuantity EMBODIED_ENERGY_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE
-			.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "kWh");
-
-	/**
-	 * The cached value of the '{@link #getEmbodiedEnergy() <em>Embodied Energy</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEmbodiedEnergy()
-	 * @generated
-	 * @ordered
-	 */
-	protected NullableQuantity embodiedEnergy = EMBODIED_ENERGY_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getEmbodiedCarbon() <em>Embodied Carbon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEmbodiedCarbon()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final NullableQuantity EMBODIED_CARBON_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE
-			.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "kg");
-
-	/**
-	 * The cached value of the '{@link #getEmbodiedCarbon() <em>Embodied Carbon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEmbodiedCarbon()
-	 * @generated
-	 * @ordered
-	 */
-	protected NullableQuantity embodiedCarbon = EMBODIED_CARBON_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getConstructionDescription() <em>Construction Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConstructionDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CONSTRUCTION_DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getConstructionDescription() <em>Construction Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConstructionDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected String constructionDescription = CONSTRUCTION_DESCRIPTION_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getDisposalEnergy() <em>Disposal Energy</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisposalEnergy()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final NullableQuantity DISPOSAL_ENERGY_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE
-			.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "kWh");
-
-	/**
-	 * The cached value of the '{@link #getDisposalEnergy() <em>Disposal Energy</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisposalEnergy()
-	 * @generated
-	 * @ordered
-	 */
-	protected NullableQuantity disposalEnergy = DISPOSAL_ENERGY_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getDisposalCarbon() <em>Disposal Carbon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisposalCarbon()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final NullableQuantity DISPOSAL_CARBON_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE
-			.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "kg");
-
-	/**
-	 * The cached value of the '{@link #getDisposalCarbon() <em>Disposal Carbon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisposalCarbon()
-	 * @generated
-	 * @ordered
-	 */
-	protected NullableQuantity disposalCarbon = DISPOSAL_CARBON_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getDisposalDescription() <em>Disposal Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisposalDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DISPOSAL_DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDisposalDescription() <em>Disposal Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisposalDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected String disposalDescription = DISPOSAL_DESCRIPTION_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected LifeCycleImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return BuildingPhysicsPackage.Literals.LIFE_CYCLE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NullableQuantity getEmbodiedEnergy() {
-		return embodiedEnergy;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void setEmbodiedEnergy(NullableQuantity newEmbodiedEnergy) {
-		NullableQuantity oldEmbodiedEnergy = embodiedEnergy;
-		embodiedEnergy = newEmbodiedEnergy;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildingPhysicsPackage.LIFE_CYCLE__EMBODIED_ENERGY,
-					oldEmbodiedEnergy, embodiedEnergy));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NullableQuantity getEmbodiedCarbon() {
-		return embodiedCarbon;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void setEmbodiedCarbon(NullableQuantity newEmbodiedCarbon) {
-		NullableQuantity oldEmbodiedCarbon = embodiedCarbon;
-		embodiedCarbon = newEmbodiedCarbon;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildingPhysicsPackage.LIFE_CYCLE__EMBODIED_CARBON,
-					oldEmbodiedCarbon, embodiedCarbon));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getConstructionDescription() {
-		return constructionDescription;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void setConstructionDescription(String newConstructionDescription) {
-		String oldConstructionDescription = constructionDescription;
-		constructionDescription = newConstructionDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					BuildingPhysicsPackage.LIFE_CYCLE__CONSTRUCTION_DESCRIPTION, oldConstructionDescription,
-					constructionDescription));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NullableQuantity getDisposalEnergy() {
-		return disposalEnergy;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void setDisposalEnergy(NullableQuantity newDisposalEnergy) {
-		NullableQuantity oldDisposalEnergy = disposalEnergy;
-		disposalEnergy = newDisposalEnergy;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildingPhysicsPackage.LIFE_CYCLE__DISPOSAL_ENERGY,
-					oldDisposalEnergy, disposalEnergy));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NullableQuantity getDisposalCarbon() {
-		return disposalCarbon;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void setDisposalCarbon(NullableQuantity newDisposalCarbon) {
-		NullableQuantity oldDisposalCarbon = disposalCarbon;
-		disposalCarbon = newDisposalCarbon;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildingPhysicsPackage.LIFE_CYCLE__DISPOSAL_CARBON,
-					oldDisposalCarbon, disposalCarbon));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getDisposalDescription() {
-		return disposalDescription;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void setDisposalDescription(String newDisposalDescription) {
-		String oldDisposalDescription = disposalDescription;
-		disposalDescription = newDisposalDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					BuildingPhysicsPackage.LIFE_CYCLE__DISPOSAL_DESCRIPTION, oldDisposalDescription,
-					disposalDescription));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case BuildingPhysicsPackage.LIFE_CYCLE__EMBODIED_ENERGY:
-			return getEmbodiedEnergy();
-		case BuildingPhysicsPackage.LIFE_CYCLE__EMBODIED_CARBON:
-			return getEmbodiedCarbon();
-		case BuildingPhysicsPackage.LIFE_CYCLE__CONSTRUCTION_DESCRIPTION:
-			return getConstructionDescription();
-		case BuildingPhysicsPackage.LIFE_CYCLE__DISPOSAL_ENERGY:
-			return getDisposalEnergy();
-		case BuildingPhysicsPackage.LIFE_CYCLE__DISPOSAL_CARBON:
-			return getDisposalCarbon();
-		case BuildingPhysicsPackage.LIFE_CYCLE__DISPOSAL_DESCRIPTION:
-			return getDisposalDescription();
-		}
-		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.LIFE_CYCLE__EMBODIED_ENERGY:
-			setEmbodiedEnergy((NullableQuantity) newValue);
-			return;
-		case BuildingPhysicsPackage.LIFE_CYCLE__EMBODIED_CARBON:
-			setEmbodiedCarbon((NullableQuantity) newValue);
-			return;
-		case BuildingPhysicsPackage.LIFE_CYCLE__CONSTRUCTION_DESCRIPTION:
-			setConstructionDescription((String) newValue);
-			return;
-		case BuildingPhysicsPackage.LIFE_CYCLE__DISPOSAL_ENERGY:
-			setDisposalEnergy((NullableQuantity) newValue);
-			return;
-		case BuildingPhysicsPackage.LIFE_CYCLE__DISPOSAL_CARBON:
-			setDisposalCarbon((NullableQuantity) newValue);
-			return;
-		case BuildingPhysicsPackage.LIFE_CYCLE__DISPOSAL_DESCRIPTION:
-			setDisposalDescription((String) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case BuildingPhysicsPackage.LIFE_CYCLE__EMBODIED_ENERGY:
-			setEmbodiedEnergy(EMBODIED_ENERGY_EDEFAULT);
-			return;
-		case BuildingPhysicsPackage.LIFE_CYCLE__EMBODIED_CARBON:
-			setEmbodiedCarbon(EMBODIED_CARBON_EDEFAULT);
-			return;
-		case BuildingPhysicsPackage.LIFE_CYCLE__CONSTRUCTION_DESCRIPTION:
-			setConstructionDescription(CONSTRUCTION_DESCRIPTION_EDEFAULT);
-			return;
-		case BuildingPhysicsPackage.LIFE_CYCLE__DISPOSAL_ENERGY:
-			setDisposalEnergy(DISPOSAL_ENERGY_EDEFAULT);
-			return;
-		case BuildingPhysicsPackage.LIFE_CYCLE__DISPOSAL_CARBON:
-			setDisposalCarbon(DISPOSAL_CARBON_EDEFAULT);
-			return;
-		case BuildingPhysicsPackage.LIFE_CYCLE__DISPOSAL_DESCRIPTION:
-			setDisposalDescription(DISPOSAL_DESCRIPTION_EDEFAULT);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-		case BuildingPhysicsPackage.LIFE_CYCLE__EMBODIED_ENERGY:
-			return EMBODIED_ENERGY_EDEFAULT == null ? embodiedEnergy != null
-					: !EMBODIED_ENERGY_EDEFAULT.equals(embodiedEnergy);
-		case BuildingPhysicsPackage.LIFE_CYCLE__EMBODIED_CARBON:
-			return EMBODIED_CARBON_EDEFAULT == null ? embodiedCarbon != null
-					: !EMBODIED_CARBON_EDEFAULT.equals(embodiedCarbon);
-		case BuildingPhysicsPackage.LIFE_CYCLE__CONSTRUCTION_DESCRIPTION:
-			return CONSTRUCTION_DESCRIPTION_EDEFAULT == null ? constructionDescription != null
-					: !CONSTRUCTION_DESCRIPTION_EDEFAULT.equals(constructionDescription);
-		case BuildingPhysicsPackage.LIFE_CYCLE__DISPOSAL_ENERGY:
-			return DISPOSAL_ENERGY_EDEFAULT == null ? disposalEnergy != null
-					: !DISPOSAL_ENERGY_EDEFAULT.equals(disposalEnergy);
-		case BuildingPhysicsPackage.LIFE_CYCLE__DISPOSAL_CARBON:
-			return DISPOSAL_CARBON_EDEFAULT == null ? disposalCarbon != null
-					: !DISPOSAL_CARBON_EDEFAULT.equals(disposalCarbon);
-		case BuildingPhysicsPackage.LIFE_CYCLE__DISPOSAL_DESCRIPTION:
-			return DISPOSAL_DESCRIPTION_EDEFAULT == null ? disposalDescription != null
-					: !DISPOSAL_DESCRIPTION_EDEFAULT.equals(disposalDescription);
-		}
-		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(" (embodiedEnergy: ");
-		result.append(embodiedEnergy);
-		result.append(", embodiedCarbon: ");
-		result.append(embodiedCarbon);
-		result.append(", constructionDescription: ");
-		result.append(constructionDescription);
-		result.append(", disposalEnergy: ");
-		result.append(disposalEnergy);
-		result.append(", disposalCarbon: ");
-		result.append(disposalCarbon);
-		result.append(", disposalDescription: ");
-		result.append(disposalDescription);
-		result.append(')');
-		return result.toString();
-	}
-
-} //LifeCycleImpl

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

@@ -30,6 +30,12 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  *   <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>
  *   <li>{@link de.hftstuttgart.buildingphysics.impl.MaterialImpl#getConductivity <em>Conductivity</em>}</li>
+ *   <li>{@link de.hftstuttgart.buildingphysics.impl.MaterialImpl#getEmbodiedEnergy <em>Embodied Energy</em>}</li>
+ *   <li>{@link de.hftstuttgart.buildingphysics.impl.MaterialImpl#getEmbodiedCarbon <em>Embodied Carbon</em>}</li>
+ *   <li>{@link de.hftstuttgart.buildingphysics.impl.MaterialImpl#getConstructionDescription <em>Construction Description</em>}</li>
+ *   <li>{@link de.hftstuttgart.buildingphysics.impl.MaterialImpl#getDisposalEnergy <em>Disposal Energy</em>}</li>
+ *   <li>{@link de.hftstuttgart.buildingphysics.impl.MaterialImpl#getDisposalCarbon <em>Disposal Carbon</em>}</li>
+ *   <li>{@link de.hftstuttgart.buildingphysics.impl.MaterialImpl#getDisposalDescription <em>Disposal Description</em>}</li>
  * </ul>
  *
  * @generated
@@ -43,7 +49,7 @@ public class MaterialImpl extends MinimalEObjectImpl.Container implements Materi
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int ID_EDEFAULT = 0;
+	protected static final long ID_EDEFAULT = 0L;
 
 	/**
 	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
@@ -53,7 +59,7 @@ public class MaterialImpl extends MinimalEObjectImpl.Container implements Materi
 	 * @generated
 	 * @ordered
 	 */
-	protected int id = ID_EDEFAULT;
+	protected long id = ID_EDEFAULT;
 
 	/**
 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
@@ -83,7 +89,8 @@ public class MaterialImpl extends MinimalEObjectImpl.Container implements Materi
 	 * @generated
 	 * @ordered
 	 */
-	protected static final double DENSITY_EDEFAULT = 0.0;
+	protected static final NullableQuantity DENSITY_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE
+			.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "kg/m\u00b3");
 
 	/**
 	 * The cached value of the '{@link #getDensity() <em>Density</em>}' attribute.
@@ -93,7 +100,7 @@ public class MaterialImpl extends MinimalEObjectImpl.Container implements Materi
 	 * @generated
 	 * @ordered
 	 */
-	protected double density = DENSITY_EDEFAULT;
+	protected NullableQuantity density = DENSITY_EDEFAULT;
 
 	/**
 	 * The default value of the '{@link #getHeatCapacity() <em>Heat Capacity</em>}' attribute.
@@ -124,7 +131,8 @@ public class MaterialImpl extends MinimalEObjectImpl.Container implements Materi
 	 * @generated
 	 * @ordered
 	 */
-	protected static final double CONDUCTIVITY_EDEFAULT = 0.0;
+	protected static final NullableQuantity CONDUCTIVITY_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE
+			.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "W/(m*K)");
 
 	/**
 	 * The cached value of the '{@link #getConductivity() <em>Conductivity</em>}' attribute.
@@ -134,7 +142,131 @@ public class MaterialImpl extends MinimalEObjectImpl.Container implements Materi
 	 * @generated
 	 * @ordered
 	 */
-	protected double conductivity = CONDUCTIVITY_EDEFAULT;
+	protected NullableQuantity conductivity = CONDUCTIVITY_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getEmbodiedEnergy() <em>Embodied Energy</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getEmbodiedEnergy()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final NullableQuantity EMBODIED_ENERGY_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE
+			.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "kW*h/kg");
+
+	/**
+	 * The cached value of the '{@link #getEmbodiedEnergy() <em>Embodied Energy</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getEmbodiedEnergy()
+	 * @generated
+	 * @ordered
+	 */
+	protected NullableQuantity embodiedEnergy = EMBODIED_ENERGY_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getEmbodiedCarbon() <em>Embodied Carbon</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getEmbodiedCarbon()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final NullableQuantity EMBODIED_CARBON_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE
+			.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "kg");
+
+	/**
+	 * The cached value of the '{@link #getEmbodiedCarbon() <em>Embodied Carbon</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getEmbodiedCarbon()
+	 * @generated
+	 * @ordered
+	 */
+	protected NullableQuantity embodiedCarbon = EMBODIED_CARBON_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getConstructionDescription() <em>Construction Description</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getConstructionDescription()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String CONSTRUCTION_DESCRIPTION_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getConstructionDescription() <em>Construction Description</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getConstructionDescription()
+	 * @generated
+	 * @ordered
+	 */
+	protected String constructionDescription = CONSTRUCTION_DESCRIPTION_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getDisposalEnergy() <em>Disposal Energy</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDisposalEnergy()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final NullableQuantity DISPOSAL_ENERGY_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE
+			.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "kW*h/kg");
+
+	/**
+	 * The cached value of the '{@link #getDisposalEnergy() <em>Disposal Energy</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDisposalEnergy()
+	 * @generated
+	 * @ordered
+	 */
+	protected NullableQuantity disposalEnergy = DISPOSAL_ENERGY_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getDisposalCarbon() <em>Disposal Carbon</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDisposalCarbon()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final NullableQuantity DISPOSAL_CARBON_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE
+			.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "kg");
+
+	/**
+	 * The cached value of the '{@link #getDisposalCarbon() <em>Disposal Carbon</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDisposalCarbon()
+	 * @generated
+	 * @ordered
+	 */
+	protected NullableQuantity disposalCarbon = DISPOSAL_CARBON_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getDisposalDescription() <em>Disposal Description</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDisposalDescription()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String DISPOSAL_DESCRIPTION_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getDisposalDescription() <em>Disposal Description</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDisposalDescription()
+	 * @generated
+	 * @ordered
+	 */
+	protected String disposalDescription = DISPOSAL_DESCRIPTION_EDEFAULT;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -161,7 +293,7 @@ public class MaterialImpl extends MinimalEObjectImpl.Container implements Materi
 	 * @generated
 	 */
 	@Override
-	public int getId() {
+	public long getId() {
 		return id;
 	}
 
@@ -171,8 +303,8 @@ public class MaterialImpl extends MinimalEObjectImpl.Container implements Materi
 	 * @generated
 	 */
 	@Override
-	public void setId(int newId) {
-		int oldId = id;
+	public void setId(long newId) {
+		long oldId = id;
 		id = newId;
 		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, BuildingPhysicsPackage.MATERIAL__ID, oldId, id));
@@ -208,7 +340,7 @@ public class MaterialImpl extends MinimalEObjectImpl.Container implements Materi
 	 * @generated
 	 */
 	@Override
-	public double getDensity() {
+	public NullableQuantity getDensity() {
 		return density;
 	}
 
@@ -218,8 +350,8 @@ public class MaterialImpl extends MinimalEObjectImpl.Container implements Materi
 	 * @generated
 	 */
 	@Override
-	public void setDensity(double newDensity) {
-		double oldDensity = density;
+	public void setDensity(NullableQuantity newDensity) {
+		NullableQuantity oldDensity = density;
 		density = newDensity;
 		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, BuildingPhysicsPackage.MATERIAL__DENSITY, oldDensity,
@@ -256,7 +388,7 @@ public class MaterialImpl extends MinimalEObjectImpl.Container implements Materi
 	 * @generated
 	 */
 	@Override
-	public double getConductivity() {
+	public NullableQuantity getConductivity() {
 		return conductivity;
 	}
 
@@ -266,14 +398,159 @@ public class MaterialImpl extends MinimalEObjectImpl.Container implements Materi
 	 * @generated
 	 */
 	@Override
-	public void setConductivity(double newConductivity) {
-		double oldConductivity = conductivity;
+	public void setConductivity(NullableQuantity newConductivity) {
+		NullableQuantity oldConductivity = conductivity;
 		conductivity = newConductivity;
 		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, BuildingPhysicsPackage.MATERIAL__CONDUCTIVITY,
 					oldConductivity, conductivity));
 	}
 
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NullableQuantity getEmbodiedEnergy() {
+		return embodiedEnergy;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setEmbodiedEnergy(NullableQuantity newEmbodiedEnergy) {
+		NullableQuantity oldEmbodiedEnergy = embodiedEnergy;
+		embodiedEnergy = newEmbodiedEnergy;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, BuildingPhysicsPackage.MATERIAL__EMBODIED_ENERGY,
+					oldEmbodiedEnergy, embodiedEnergy));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NullableQuantity getEmbodiedCarbon() {
+		return embodiedCarbon;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setEmbodiedCarbon(NullableQuantity newEmbodiedCarbon) {
+		NullableQuantity oldEmbodiedCarbon = embodiedCarbon;
+		embodiedCarbon = newEmbodiedCarbon;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, BuildingPhysicsPackage.MATERIAL__EMBODIED_CARBON,
+					oldEmbodiedCarbon, embodiedCarbon));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getConstructionDescription() {
+		return constructionDescription;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setConstructionDescription(String newConstructionDescription) {
+		String oldConstructionDescription = constructionDescription;
+		constructionDescription = newConstructionDescription;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					BuildingPhysicsPackage.MATERIAL__CONSTRUCTION_DESCRIPTION, oldConstructionDescription,
+					constructionDescription));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NullableQuantity getDisposalEnergy() {
+		return disposalEnergy;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDisposalEnergy(NullableQuantity newDisposalEnergy) {
+		NullableQuantity oldDisposalEnergy = disposalEnergy;
+		disposalEnergy = newDisposalEnergy;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, BuildingPhysicsPackage.MATERIAL__DISPOSAL_ENERGY,
+					oldDisposalEnergy, disposalEnergy));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NullableQuantity getDisposalCarbon() {
+		return disposalCarbon;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDisposalCarbon(NullableQuantity newDisposalCarbon) {
+		NullableQuantity oldDisposalCarbon = disposalCarbon;
+		disposalCarbon = newDisposalCarbon;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, BuildingPhysicsPackage.MATERIAL__DISPOSAL_CARBON,
+					oldDisposalCarbon, disposalCarbon));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getDisposalDescription() {
+		return disposalDescription;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDisposalDescription(String newDisposalDescription) {
+		String oldDisposalDescription = disposalDescription;
+		disposalDescription = newDisposalDescription;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, BuildingPhysicsPackage.MATERIAL__DISPOSAL_DESCRIPTION,
+					oldDisposalDescription, disposalDescription));
+	}
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -292,6 +569,18 @@ public class MaterialImpl extends MinimalEObjectImpl.Container implements Materi
 			return getHeatCapacity();
 		case BuildingPhysicsPackage.MATERIAL__CONDUCTIVITY:
 			return getConductivity();
+		case BuildingPhysicsPackage.MATERIAL__EMBODIED_ENERGY:
+			return getEmbodiedEnergy();
+		case BuildingPhysicsPackage.MATERIAL__EMBODIED_CARBON:
+			return getEmbodiedCarbon();
+		case BuildingPhysicsPackage.MATERIAL__CONSTRUCTION_DESCRIPTION:
+			return getConstructionDescription();
+		case BuildingPhysicsPackage.MATERIAL__DISPOSAL_ENERGY:
+			return getDisposalEnergy();
+		case BuildingPhysicsPackage.MATERIAL__DISPOSAL_CARBON:
+			return getDisposalCarbon();
+		case BuildingPhysicsPackage.MATERIAL__DISPOSAL_DESCRIPTION:
+			return getDisposalDescription();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -305,19 +594,37 @@ public class MaterialImpl extends MinimalEObjectImpl.Container implements Materi
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
 		case BuildingPhysicsPackage.MATERIAL__ID:
-			setId((Integer) newValue);
+			setId((Long) newValue);
 			return;
 		case BuildingPhysicsPackage.MATERIAL__NAME:
 			setName((String) newValue);
 			return;
 		case BuildingPhysicsPackage.MATERIAL__DENSITY:
-			setDensity((Double) newValue);
+			setDensity((NullableQuantity) newValue);
 			return;
 		case BuildingPhysicsPackage.MATERIAL__HEAT_CAPACITY:
 			setHeatCapacity((NullableQuantity) newValue);
 			return;
 		case BuildingPhysicsPackage.MATERIAL__CONDUCTIVITY:
-			setConductivity((Double) newValue);
+			setConductivity((NullableQuantity) newValue);
+			return;
+		case BuildingPhysicsPackage.MATERIAL__EMBODIED_ENERGY:
+			setEmbodiedEnergy((NullableQuantity) newValue);
+			return;
+		case BuildingPhysicsPackage.MATERIAL__EMBODIED_CARBON:
+			setEmbodiedCarbon((NullableQuantity) newValue);
+			return;
+		case BuildingPhysicsPackage.MATERIAL__CONSTRUCTION_DESCRIPTION:
+			setConstructionDescription((String) newValue);
+			return;
+		case BuildingPhysicsPackage.MATERIAL__DISPOSAL_ENERGY:
+			setDisposalEnergy((NullableQuantity) newValue);
+			return;
+		case BuildingPhysicsPackage.MATERIAL__DISPOSAL_CARBON:
+			setDisposalCarbon((NullableQuantity) newValue);
+			return;
+		case BuildingPhysicsPackage.MATERIAL__DISPOSAL_DESCRIPTION:
+			setDisposalDescription((String) newValue);
 			return;
 		}
 		super.eSet(featureID, newValue);
@@ -346,6 +653,24 @@ public class MaterialImpl extends MinimalEObjectImpl.Container implements Materi
 		case BuildingPhysicsPackage.MATERIAL__CONDUCTIVITY:
 			setConductivity(CONDUCTIVITY_EDEFAULT);
 			return;
+		case BuildingPhysicsPackage.MATERIAL__EMBODIED_ENERGY:
+			setEmbodiedEnergy(EMBODIED_ENERGY_EDEFAULT);
+			return;
+		case BuildingPhysicsPackage.MATERIAL__EMBODIED_CARBON:
+			setEmbodiedCarbon(EMBODIED_CARBON_EDEFAULT);
+			return;
+		case BuildingPhysicsPackage.MATERIAL__CONSTRUCTION_DESCRIPTION:
+			setConstructionDescription(CONSTRUCTION_DESCRIPTION_EDEFAULT);
+			return;
+		case BuildingPhysicsPackage.MATERIAL__DISPOSAL_ENERGY:
+			setDisposalEnergy(DISPOSAL_ENERGY_EDEFAULT);
+			return;
+		case BuildingPhysicsPackage.MATERIAL__DISPOSAL_CARBON:
+			setDisposalCarbon(DISPOSAL_CARBON_EDEFAULT);
+			return;
+		case BuildingPhysicsPackage.MATERIAL__DISPOSAL_DESCRIPTION:
+			setDisposalDescription(DISPOSAL_DESCRIPTION_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -363,11 +688,29 @@ public class MaterialImpl extends MinimalEObjectImpl.Container implements Materi
 		case BuildingPhysicsPackage.MATERIAL__NAME:
 			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
 		case BuildingPhysicsPackage.MATERIAL__DENSITY:
-			return density != DENSITY_EDEFAULT;
+			return DENSITY_EDEFAULT == null ? density != null : !DENSITY_EDEFAULT.equals(density);
 		case BuildingPhysicsPackage.MATERIAL__HEAT_CAPACITY:
 			return HEAT_CAPACITY_EDEFAULT == null ? heatCapacity != null : !HEAT_CAPACITY_EDEFAULT.equals(heatCapacity);
 		case BuildingPhysicsPackage.MATERIAL__CONDUCTIVITY:
-			return conductivity != CONDUCTIVITY_EDEFAULT;
+			return CONDUCTIVITY_EDEFAULT == null ? conductivity != null : !CONDUCTIVITY_EDEFAULT.equals(conductivity);
+		case BuildingPhysicsPackage.MATERIAL__EMBODIED_ENERGY:
+			return EMBODIED_ENERGY_EDEFAULT == null ? embodiedEnergy != null
+					: !EMBODIED_ENERGY_EDEFAULT.equals(embodiedEnergy);
+		case BuildingPhysicsPackage.MATERIAL__EMBODIED_CARBON:
+			return EMBODIED_CARBON_EDEFAULT == null ? embodiedCarbon != null
+					: !EMBODIED_CARBON_EDEFAULT.equals(embodiedCarbon);
+		case BuildingPhysicsPackage.MATERIAL__CONSTRUCTION_DESCRIPTION:
+			return CONSTRUCTION_DESCRIPTION_EDEFAULT == null ? constructionDescription != null
+					: !CONSTRUCTION_DESCRIPTION_EDEFAULT.equals(constructionDescription);
+		case BuildingPhysicsPackage.MATERIAL__DISPOSAL_ENERGY:
+			return DISPOSAL_ENERGY_EDEFAULT == null ? disposalEnergy != null
+					: !DISPOSAL_ENERGY_EDEFAULT.equals(disposalEnergy);
+		case BuildingPhysicsPackage.MATERIAL__DISPOSAL_CARBON:
+			return DISPOSAL_CARBON_EDEFAULT == null ? disposalCarbon != null
+					: !DISPOSAL_CARBON_EDEFAULT.equals(disposalCarbon);
+		case BuildingPhysicsPackage.MATERIAL__DISPOSAL_DESCRIPTION:
+			return DISPOSAL_DESCRIPTION_EDEFAULT == null ? disposalDescription != null
+					: !DISPOSAL_DESCRIPTION_EDEFAULT.equals(disposalDescription);
 		}
 		return super.eIsSet(featureID);
 	}
@@ -393,6 +736,18 @@ public class MaterialImpl extends MinimalEObjectImpl.Container implements Materi
 		result.append(heatCapacity);
 		result.append(", conductivity: ");
 		result.append(conductivity);
+		result.append(", embodiedEnergy: ");
+		result.append(embodiedEnergy);
+		result.append(", embodiedCarbon: ");
+		result.append(embodiedCarbon);
+		result.append(", constructionDescription: ");
+		result.append(constructionDescription);
+		result.append(", disposalEnergy: ");
+		result.append(disposalEnergy);
+		result.append(", disposalCarbon: ");
+		result.append(disposalCarbon);
+		result.append(", disposalDescription: ");
+		result.append(disposalDescription);
 		result.append(')');
 		return result.toString();
 	}

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

@@ -3,17 +3,17 @@
 package de.hftstuttgart.buildingphysics.impl;
 
 import de.hftstuttgart.buildingphysics.BuildingPhysicsPackage;
-import de.hftstuttgart.buildingphysics.LifeCycle;
 import de.hftstuttgart.buildingphysics.WindowType;
+
 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.common.notify.NotificationChain;
 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;
 
@@ -31,7 +31,12 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  *   <li>{@link de.hftstuttgart.buildingphysics.impl.WindowTypeImpl#getGValue <em>GValue</em>}</li>
  *   <li>{@link de.hftstuttgart.buildingphysics.impl.WindowTypeImpl#getGlazingNumber <em>Glazing Number</em>}</li>
  *   <li>{@link de.hftstuttgart.buildingphysics.impl.WindowTypeImpl#getFrameRatio <em>Frame Ratio</em>}</li>
- *   <li>{@link de.hftstuttgart.buildingphysics.impl.WindowTypeImpl#getLifeCycle <em>Life Cycle</em>}</li>
+ *   <li>{@link de.hftstuttgart.buildingphysics.impl.WindowTypeImpl#getEmbodiedEnergy <em>Embodied Energy</em>}</li>
+ *   <li>{@link de.hftstuttgart.buildingphysics.impl.WindowTypeImpl#getEmbodiedCarbon <em>Embodied Carbon</em>}</li>
+ *   <li>{@link de.hftstuttgart.buildingphysics.impl.WindowTypeImpl#getConstructionDescription <em>Construction Description</em>}</li>
+ *   <li>{@link de.hftstuttgart.buildingphysics.impl.WindowTypeImpl#getDisposalEnergy <em>Disposal Energy</em>}</li>
+ *   <li>{@link de.hftstuttgart.buildingphysics.impl.WindowTypeImpl#getDisposalCarbon <em>Disposal Carbon</em>}</li>
+ *   <li>{@link de.hftstuttgart.buildingphysics.impl.WindowTypeImpl#getDisposalDescription <em>Disposal Description</em>}</li>
  * </ul>
  *
  * @generated
@@ -86,7 +91,7 @@ public class WindowTypeImpl extends MinimalEObjectImpl.Container implements Wind
 	 * @ordered
 	 */
 	protected static final NullableQuantity UVALUE_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE
-			.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "W/(m\u00b2\u00b7K)");
+			.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "W/(m\u00b2*K)");
 
 	/**
 	 * The cached value of the '{@link #getUValue() <em>UValue</em>}' attribute.
@@ -146,7 +151,7 @@ public class WindowTypeImpl extends MinimalEObjectImpl.Container implements Wind
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int FRAME_RATIO_EDEFAULT = 0;
+	protected static final double FRAME_RATIO_EDEFAULT = 0.0;
 
 	/**
 	 * The cached value of the '{@link #getFrameRatio() <em>Frame Ratio</em>}' attribute.
@@ -156,17 +161,131 @@ public class WindowTypeImpl extends MinimalEObjectImpl.Container implements Wind
 	 * @generated
 	 * @ordered
 	 */
-	protected int frameRatio = FRAME_RATIO_EDEFAULT;
+	protected double frameRatio = FRAME_RATIO_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getEmbodiedEnergy() <em>Embodied Energy</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getEmbodiedEnergy()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final NullableQuantity EMBODIED_ENERGY_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE
+			.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "kW*h/m\u00b2");
+
+	/**
+	 * The cached value of the '{@link #getEmbodiedEnergy() <em>Embodied Energy</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getEmbodiedEnergy()
+	 * @generated
+	 * @ordered
+	 */
+	protected NullableQuantity embodiedEnergy = EMBODIED_ENERGY_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getEmbodiedCarbon() <em>Embodied Carbon</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getEmbodiedCarbon()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final NullableQuantity EMBODIED_CARBON_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE
+			.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "kg");
+
+	/**
+	 * The cached value of the '{@link #getEmbodiedCarbon() <em>Embodied Carbon</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getEmbodiedCarbon()
+	 * @generated
+	 * @ordered
+	 */
+	protected NullableQuantity embodiedCarbon = EMBODIED_CARBON_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getConstructionDescription() <em>Construction Description</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getConstructionDescription()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String CONSTRUCTION_DESCRIPTION_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getConstructionDescription() <em>Construction Description</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getConstructionDescription()
+	 * @generated
+	 * @ordered
+	 */
+	protected String constructionDescription = CONSTRUCTION_DESCRIPTION_EDEFAULT;
 
 	/**
-	 * The cached value of the '{@link #getLifeCycle() <em>Life Cycle</em>}' containment reference.
+	 * The default value of the '{@link #getDisposalEnergy() <em>Disposal Energy</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getLifeCycle()
+	 * @see #getDisposalEnergy()
 	 * @generated
 	 * @ordered
 	 */
-	protected LifeCycle lifeCycle;
+	protected static final NullableQuantity DISPOSAL_ENERGY_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE
+			.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "kW*h/m\u00b2");
+
+	/**
+	 * The cached value of the '{@link #getDisposalEnergy() <em>Disposal Energy</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDisposalEnergy()
+	 * @generated
+	 * @ordered
+	 */
+	protected NullableQuantity disposalEnergy = DISPOSAL_ENERGY_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getDisposalCarbon() <em>Disposal Carbon</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDisposalCarbon()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final NullableQuantity DISPOSAL_CARBON_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE
+			.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "kg");
+
+	/**
+	 * The cached value of the '{@link #getDisposalCarbon() <em>Disposal Carbon</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDisposalCarbon()
+	 * @generated
+	 * @ordered
+	 */
+	protected NullableQuantity disposalCarbon = DISPOSAL_CARBON_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getDisposalDescription() <em>Disposal Description</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDisposalDescription()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String DISPOSAL_DESCRIPTION_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getDisposalDescription() <em>Disposal Description</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDisposalDescription()
+	 * @generated
+	 * @ordered
+	 */
+	protected String disposalDescription = DISPOSAL_DESCRIPTION_EDEFAULT;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -312,7 +431,7 @@ public class WindowTypeImpl extends MinimalEObjectImpl.Container implements Wind
 	 * @generated
 	 */
 	@Override
-	public int getFrameRatio() {
+	public double getFrameRatio() {
 		return frameRatio;
 	}
 
@@ -322,8 +441,8 @@ public class WindowTypeImpl extends MinimalEObjectImpl.Container implements Wind
 	 * @generated
 	 */
 	@Override
-	public void setFrameRatio(int newFrameRatio) {
-		int oldFrameRatio = frameRatio;
+	public void setFrameRatio(double newFrameRatio) {
+		double oldFrameRatio = frameRatio;
 		frameRatio = newFrameRatio;
 		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, BuildingPhysicsPackage.WINDOW_TYPE__FRAME_RATIO,
@@ -336,8 +455,8 @@ public class WindowTypeImpl extends MinimalEObjectImpl.Container implements Wind
 	 * @generated
 	 */
 	@Override
-	public LifeCycle getLifeCycle() {
-		return lifeCycle;
+	public NullableQuantity getEmbodiedEnergy() {
+		return embodiedEnergy;
 	}
 
 	/**
@@ -345,18 +464,13 @@ public class WindowTypeImpl extends MinimalEObjectImpl.Container implements Wind
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain basicSetLifeCycle(LifeCycle newLifeCycle, NotificationChain msgs) {
-		LifeCycle oldLifeCycle = lifeCycle;
-		lifeCycle = newLifeCycle;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
-					BuildingPhysicsPackage.WINDOW_TYPE__LIFE_CYCLE, oldLifeCycle, newLifeCycle);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
-		}
-		return msgs;
+	@Override
+	public void setEmbodiedEnergy(NullableQuantity newEmbodiedEnergy) {
+		NullableQuantity oldEmbodiedEnergy = embodiedEnergy;
+		embodiedEnergy = newEmbodiedEnergy;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, BuildingPhysicsPackage.WINDOW_TYPE__EMBODIED_ENERGY,
+					oldEmbodiedEnergy, embodiedEnergy));
 	}
 
 	/**
@@ -365,21 +479,8 @@ public class WindowTypeImpl extends MinimalEObjectImpl.Container implements Wind
 	 * @generated
 	 */
 	@Override
-	public void setLifeCycle(LifeCycle newLifeCycle) {
-		if (newLifeCycle != lifeCycle) {
-			NotificationChain msgs = null;
-			if (lifeCycle != null)
-				msgs = ((InternalEObject) lifeCycle).eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE - BuildingPhysicsPackage.WINDOW_TYPE__LIFE_CYCLE, null, msgs);
-			if (newLifeCycle != null)
-				msgs = ((InternalEObject) newLifeCycle).eInverseAdd(this,
-						EOPPOSITE_FEATURE_BASE - BuildingPhysicsPackage.WINDOW_TYPE__LIFE_CYCLE, null, msgs);
-			msgs = basicSetLifeCycle(newLifeCycle, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildingPhysicsPackage.WINDOW_TYPE__LIFE_CYCLE,
-					newLifeCycle, newLifeCycle));
+	public NullableQuantity getEmbodiedCarbon() {
+		return embodiedCarbon;
 	}
 
 	/**
@@ -388,12 +489,110 @@ public class WindowTypeImpl extends MinimalEObjectImpl.Container implements Wind
 	 * @generated
 	 */
 	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case BuildingPhysicsPackage.WINDOW_TYPE__LIFE_CYCLE:
-			return basicSetLifeCycle(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
+	public void setEmbodiedCarbon(NullableQuantity newEmbodiedCarbon) {
+		NullableQuantity oldEmbodiedCarbon = embodiedCarbon;
+		embodiedCarbon = newEmbodiedCarbon;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, BuildingPhysicsPackage.WINDOW_TYPE__EMBODIED_CARBON,
+					oldEmbodiedCarbon, embodiedCarbon));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getConstructionDescription() {
+		return constructionDescription;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setConstructionDescription(String newConstructionDescription) {
+		String oldConstructionDescription = constructionDescription;
+		constructionDescription = newConstructionDescription;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					BuildingPhysicsPackage.WINDOW_TYPE__CONSTRUCTION_DESCRIPTION, oldConstructionDescription,
+					constructionDescription));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NullableQuantity getDisposalEnergy() {
+		return disposalEnergy;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDisposalEnergy(NullableQuantity newDisposalEnergy) {
+		NullableQuantity oldDisposalEnergy = disposalEnergy;
+		disposalEnergy = newDisposalEnergy;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, BuildingPhysicsPackage.WINDOW_TYPE__DISPOSAL_ENERGY,
+					oldDisposalEnergy, disposalEnergy));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NullableQuantity getDisposalCarbon() {
+		return disposalCarbon;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDisposalCarbon(NullableQuantity newDisposalCarbon) {
+		NullableQuantity oldDisposalCarbon = disposalCarbon;
+		disposalCarbon = newDisposalCarbon;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, BuildingPhysicsPackage.WINDOW_TYPE__DISPOSAL_CARBON,
+					oldDisposalCarbon, disposalCarbon));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getDisposalDescription() {
+		return disposalDescription;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDisposalDescription(String newDisposalDescription) {
+		String oldDisposalDescription = disposalDescription;
+		disposalDescription = newDisposalDescription;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET,
+					BuildingPhysicsPackage.WINDOW_TYPE__DISPOSAL_DESCRIPTION, oldDisposalDescription,
+					disposalDescription));
 	}
 
 	/**
@@ -416,8 +615,18 @@ public class WindowTypeImpl extends MinimalEObjectImpl.Container implements Wind
 			return getGlazingNumber();
 		case BuildingPhysicsPackage.WINDOW_TYPE__FRAME_RATIO:
 			return getFrameRatio();
-		case BuildingPhysicsPackage.WINDOW_TYPE__LIFE_CYCLE:
-			return getLifeCycle();
+		case BuildingPhysicsPackage.WINDOW_TYPE__EMBODIED_ENERGY:
+			return getEmbodiedEnergy();
+		case BuildingPhysicsPackage.WINDOW_TYPE__EMBODIED_CARBON:
+			return getEmbodiedCarbon();
+		case BuildingPhysicsPackage.WINDOW_TYPE__CONSTRUCTION_DESCRIPTION:
+			return getConstructionDescription();
+		case BuildingPhysicsPackage.WINDOW_TYPE__DISPOSAL_ENERGY:
+			return getDisposalEnergy();
+		case BuildingPhysicsPackage.WINDOW_TYPE__DISPOSAL_CARBON:
+			return getDisposalCarbon();
+		case BuildingPhysicsPackage.WINDOW_TYPE__DISPOSAL_DESCRIPTION:
+			return getDisposalDescription();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -446,10 +655,25 @@ public class WindowTypeImpl extends MinimalEObjectImpl.Container implements Wind
 			setGlazingNumber((Integer) newValue);
 			return;
 		case BuildingPhysicsPackage.WINDOW_TYPE__FRAME_RATIO:
-			setFrameRatio((Integer) newValue);
+			setFrameRatio((Double) newValue);
 			return;
-		case BuildingPhysicsPackage.WINDOW_TYPE__LIFE_CYCLE:
-			setLifeCycle((LifeCycle) newValue);
+		case BuildingPhysicsPackage.WINDOW_TYPE__EMBODIED_ENERGY:
+			setEmbodiedEnergy((NullableQuantity) newValue);
+			return;
+		case BuildingPhysicsPackage.WINDOW_TYPE__EMBODIED_CARBON:
+			setEmbodiedCarbon((NullableQuantity) newValue);
+			return;
+		case BuildingPhysicsPackage.WINDOW_TYPE__CONSTRUCTION_DESCRIPTION:
+			setConstructionDescription((String) newValue);
+			return;
+		case BuildingPhysicsPackage.WINDOW_TYPE__DISPOSAL_ENERGY:
+			setDisposalEnergy((NullableQuantity) newValue);
+			return;
+		case BuildingPhysicsPackage.WINDOW_TYPE__DISPOSAL_CARBON:
+			setDisposalCarbon((NullableQuantity) newValue);
+			return;
+		case BuildingPhysicsPackage.WINDOW_TYPE__DISPOSAL_DESCRIPTION:
+			setDisposalDescription((String) newValue);
 			return;
 		}
 		super.eSet(featureID, newValue);
@@ -481,8 +705,23 @@ public class WindowTypeImpl extends MinimalEObjectImpl.Container implements Wind
 		case BuildingPhysicsPackage.WINDOW_TYPE__FRAME_RATIO:
 			setFrameRatio(FRAME_RATIO_EDEFAULT);
 			return;
-		case BuildingPhysicsPackage.WINDOW_TYPE__LIFE_CYCLE:
-			setLifeCycle((LifeCycle) null);
+		case BuildingPhysicsPackage.WINDOW_TYPE__EMBODIED_ENERGY:
+			setEmbodiedEnergy(EMBODIED_ENERGY_EDEFAULT);
+			return;
+		case BuildingPhysicsPackage.WINDOW_TYPE__EMBODIED_CARBON:
+			setEmbodiedCarbon(EMBODIED_CARBON_EDEFAULT);
+			return;
+		case BuildingPhysicsPackage.WINDOW_TYPE__CONSTRUCTION_DESCRIPTION:
+			setConstructionDescription(CONSTRUCTION_DESCRIPTION_EDEFAULT);
+			return;
+		case BuildingPhysicsPackage.WINDOW_TYPE__DISPOSAL_ENERGY:
+			setDisposalEnergy(DISPOSAL_ENERGY_EDEFAULT);
+			return;
+		case BuildingPhysicsPackage.WINDOW_TYPE__DISPOSAL_CARBON:
+			setDisposalCarbon(DISPOSAL_CARBON_EDEFAULT);
+			return;
+		case BuildingPhysicsPackage.WINDOW_TYPE__DISPOSAL_DESCRIPTION:
+			setDisposalDescription(DISPOSAL_DESCRIPTION_EDEFAULT);
 			return;
 		}
 		super.eUnset(featureID);
@@ -508,8 +747,24 @@ public class WindowTypeImpl extends MinimalEObjectImpl.Container implements Wind
 			return glazingNumber != GLAZING_NUMBER_EDEFAULT;
 		case BuildingPhysicsPackage.WINDOW_TYPE__FRAME_RATIO:
 			return frameRatio != FRAME_RATIO_EDEFAULT;
-		case BuildingPhysicsPackage.WINDOW_TYPE__LIFE_CYCLE:
-			return lifeCycle != null;
+		case BuildingPhysicsPackage.WINDOW_TYPE__EMBODIED_ENERGY:
+			return EMBODIED_ENERGY_EDEFAULT == null ? embodiedEnergy != null
+					: !EMBODIED_ENERGY_EDEFAULT.equals(embodiedEnergy);
+		case BuildingPhysicsPackage.WINDOW_TYPE__EMBODIED_CARBON:
+			return EMBODIED_CARBON_EDEFAULT == null ? embodiedCarbon != null
+					: !EMBODIED_CARBON_EDEFAULT.equals(embodiedCarbon);
+		case BuildingPhysicsPackage.WINDOW_TYPE__CONSTRUCTION_DESCRIPTION:
+			return CONSTRUCTION_DESCRIPTION_EDEFAULT == null ? constructionDescription != null
+					: !CONSTRUCTION_DESCRIPTION_EDEFAULT.equals(constructionDescription);
+		case BuildingPhysicsPackage.WINDOW_TYPE__DISPOSAL_ENERGY:
+			return DISPOSAL_ENERGY_EDEFAULT == null ? disposalEnergy != null
+					: !DISPOSAL_ENERGY_EDEFAULT.equals(disposalEnergy);
+		case BuildingPhysicsPackage.WINDOW_TYPE__DISPOSAL_CARBON:
+			return DISPOSAL_CARBON_EDEFAULT == null ? disposalCarbon != null
+					: !DISPOSAL_CARBON_EDEFAULT.equals(disposalCarbon);
+		case BuildingPhysicsPackage.WINDOW_TYPE__DISPOSAL_DESCRIPTION:
+			return DISPOSAL_DESCRIPTION_EDEFAULT == null ? disposalDescription != null
+					: !DISPOSAL_DESCRIPTION_EDEFAULT.equals(disposalDescription);
 		}
 		return super.eIsSet(featureID);
 	}
@@ -537,6 +792,18 @@ public class WindowTypeImpl extends MinimalEObjectImpl.Container implements Wind
 		result.append(glazingNumber);
 		result.append(", frameRatio: ");
 		result.append(frameRatio);
+		result.append(", embodiedEnergy: ");
+		result.append(embodiedEnergy);
+		result.append(", embodiedCarbon: ");
+		result.append(embodiedCarbon);
+		result.append(", constructionDescription: ");
+		result.append(constructionDescription);
+		result.append(", disposalEnergy: ");
+		result.append(disposalEnergy);
+		result.append(", disposalCarbon: ");
+		result.append(disposalCarbon);
+		result.append(", disposalDescription: ");
+		result.append(disposalDescription);
 		result.append(')');
 		return result.toString();
 	}

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

@@ -101,11 +101,6 @@ public class BuildingPhysicsAdapterFactory extends AdapterFactoryImpl {
 			return createMaterialAdapter();
 		}
 
-		@Override
-		public Adapter caseLifeCycle(LifeCycle object) {
-			return createLifeCycleAdapter();
-		}
-
 		@Override
 		public Adapter defaultCase(EObject object) {
 			return createEObjectAdapter();
@@ -223,20 +218,6 @@ public class BuildingPhysicsAdapterFactory extends AdapterFactoryImpl {
 		return null;
 	}
 
-	/**
-	 * Creates a new adapter for an object of class '{@link de.hftstuttgart.buildingphysics.LifeCycle <em>Life Cycle</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.LifeCycle
-	 * @generated
-	 */
-	public Adapter createLifeCycleAdapter() {
-		return null;
-	}
-
 	/**
 	 * Creates a new adapter for the default case.
 	 * <!-- begin-user-doc -->

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

@@ -119,13 +119,6 @@ public class BuildingPhysicsSwitch<T> extends Switch<T> {
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case BuildingPhysicsPackage.LIFE_CYCLE: {
-			LifeCycle lifeCycle = (LifeCycle) theEObject;
-			T result = caseLifeCycle(lifeCycle);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
 		default:
 			return defaultCase(theEObject);
 		}
@@ -236,21 +229,6 @@ public class BuildingPhysicsSwitch<T> extends Switch<T> {
 		return null;
 	}
 
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Life Cycle</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>Life Cycle</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseLifeCycle(LifeCycle object) {
-		return null;
-	}
-
 	/**
 	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
 	 * <!-- begin-user-doc -->