Wall mountings consisting of several layers of materials added

de.hftstuttgart.buildingphysics.edit/plugin.properties

@@ -70,3 +70,19 @@ _UI_Material_constructionDescription_feature = Construction Description
 _UI_Material_disposalEnergy_feature = Disposal Energy
 _UI_Material_disposalCarbon_feature = Disposal Carbon
 _UI_Material_disposalDescription_feature = Disposal Description
+_UI_ConstructionCategory_type = Construction Category
+_UI_Mounting_type = Mounting
+_UI_Layer_type = Layer
+_UI_MaterialCatalog_constructionCategories_feature = Construction Categories
+_UI_ConstructionCategory_name_feature = Name
+_UI_ConstructionCategory_mountings_feature = Mountings
+_UI_Mounting_id_feature = Id
+_UI_Mounting_name_feature = Name
+_UI_Mounting_layers_feature = Layers
+_UI_Layer_material_feature = Material
+_UI_Layer_thickness_feature = Thickness
+_UI_MaterialCategory_materials_feature = Materials
+_UI_WindowType_windowTypeId_feature = Window Type Id
+_UI_Material_materialId_feature = Material Id
+_UI_Mounting_mountingId_feature = Mounting Id
+_UI_Layer__feature = 

de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/BuildingPhysicsItemProviderAdapterFactory.java

@@ -210,6 +210,75 @@ public class BuildingPhysicsItemProviderAdapterFactory extends BuildingPhysicsAd
 		return materialItemProvider;
 	}
 
+	/**
+	 * This keeps track of the one adapter used for all {@link de.hftstuttgart.buildingphysics.ConstructionCategory} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ConstructionCategoryItemProvider constructionCategoryItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link de.hftstuttgart.buildingphysics.ConstructionCategory}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createConstructionCategoryAdapter() {
+		if (constructionCategoryItemProvider == null) {
+			constructionCategoryItemProvider = new ConstructionCategoryItemProvider(this);
+		}
+
+		return constructionCategoryItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link de.hftstuttgart.buildingphysics.Mounting} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected MountingItemProvider mountingItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link de.hftstuttgart.buildingphysics.Mounting}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createMountingAdapter() {
+		if (mountingItemProvider == null) {
+			mountingItemProvider = new MountingItemProvider(this);
+		}
+
+		return mountingItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link de.hftstuttgart.buildingphysics.Layer} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected LayerItemProvider layerItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link de.hftstuttgart.buildingphysics.Layer}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createLayerAdapter() {
+		if (layerItemProvider == null) {
+			layerItemProvider = new LayerItemProvider(this);
+		}
+
+		return layerItemProvider;
+	}
+
 	/**
 	 * This returns the root adapter factory that contains this factory.
 	 * <!-- begin-user-doc -->
@@ -327,6 +396,12 @@ public class BuildingPhysicsItemProviderAdapterFactory extends BuildingPhysicsAd
 			materialCategoryItemProvider.dispose();
 		if (materialItemProvider != null)
 			materialItemProvider.dispose();
+		if (constructionCategoryItemProvider != null)
+			constructionCategoryItemProvider.dispose();
+		if (mountingItemProvider != null)
+			mountingItemProvider.dispose();
+		if (layerItemProvider != null)
+			layerItemProvider.dispose();
 	}
 
 }

de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/ConstructionCategoryItemProvider.java

+/**
+ */
+package de.hftstuttgart.buildingphysics.provider;
+
+import de.hftstuttgart.buildingphysics.BuildingPhysicsFactory;
+import de.hftstuttgart.buildingphysics.BuildingPhysicsPackage;
+import de.hftstuttgart.buildingphysics.ConstructionCategory;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.common.util.ResourceLocator;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemProviderAdapter;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+
+/**
+ * This is the item provider adapter for a {@link de.hftstuttgart.buildingphysics.ConstructionCategory} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class ConstructionCategoryItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
+		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ConstructionCategoryItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addNamePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Name feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addNamePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(
+				((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
+				getString("_UI_ConstructionCategory_name_feature"),
+				getString("_UI_PropertyDescriptor_description", "_UI_ConstructionCategory_name_feature",
+						"_UI_ConstructionCategory_type"),
+				BuildingPhysicsPackage.Literals.CONSTRUCTION_CATEGORY__NAME, true, false, false,
+				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+	}
+
+	/**
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if (childrenFeatures == null) {
+			super.getChildrenFeatures(object);
+			childrenFeatures.add(BuildingPhysicsPackage.Literals.CONSTRUCTION_CATEGORY__MOUNTINGS);
+		}
+		return childrenFeatures;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EStructuralFeature getChildFeature(Object object, Object child) {
+		// Check the type of the specified child object and return the proper feature to use for
+		// adding (see {@link AddCommand}) it as a child.
+
+		return super.getChildFeature(object, child);
+	}
+
+	/**
+	 * This returns ConstructionCategory.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ConstructionCategory"));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected boolean shouldComposeCreationImage() {
+		return true;
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((ConstructionCategory) object).getName();
+		return label == null || label.length() == 0 ? getString("_UI_ConstructionCategory_type")
+				: getString("_UI_ConstructionCategory_type") + " " + label;
+	}
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(ConstructionCategory.class)) {
+		case BuildingPhysicsPackage.CONSTRUCTION_CATEGORY__NAME:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case BuildingPhysicsPackage.CONSTRUCTION_CATEGORY__MOUNTINGS:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+
+		newChildDescriptors.add(createChildParameter(BuildingPhysicsPackage.Literals.CONSTRUCTION_CATEGORY__MOUNTINGS,
+				BuildingPhysicsFactory.eINSTANCE.createMounting()));
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		return BuildingPhysicsEditPlugin.INSTANCE;
+	}
+
+}

de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/LayerItemProvider.java

+/**
+ */
+package de.hftstuttgart.buildingphysics.provider;
+
+import de.hftstuttgart.buildingphysics.BuildingPhysicsPackage;
+import de.hftstuttgart.buildingphysics.Layer;
+
+import de.hftstuttgart.cityunits.model.NullableQuantity;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.common.util.ResourceLocator;
+
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemProviderAdapter;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+
+/**
+ * This is the item provider adapter for a {@link de.hftstuttgart.buildingphysics.Layer} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class LayerItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
+		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public LayerItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addMaterialPropertyDescriptor(object);
+			addThicknessPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Material feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addMaterialPropertyDescriptor(Object object) {
+		itemPropertyDescriptors
+				.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+						getResourceLocator(), getString("_UI_Layer_material_feature"),
+						getString("_UI_PropertyDescriptor_description", "_UI_Layer_material_feature", "_UI_Layer_type"),
+						BuildingPhysicsPackage.Literals.LAYER__MATERIAL, true, false, true, null, null, null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Thickness feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addThicknessPropertyDescriptor(Object object) {
+		itemPropertyDescriptors
+				.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+						getResourceLocator(), getString("_UI_Layer_thickness_feature"),
+						getString("_UI_PropertyDescriptor_description", "_UI_Layer_thickness_feature",
+								"_UI_Layer_type"),
+						BuildingPhysicsPackage.Literals.LAYER__THICKNESS, true, false, false,
+						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+	}
+
+	/**
+	 * This returns Layer.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/Layer"));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected boolean shouldComposeCreationImage() {
+		return true;
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		NullableQuantity labelValue = ((Layer) object).getThickness();
+		String label = labelValue == null ? null : labelValue.toString();
+		return label == null || label.length() == 0 ? getString("_UI_Layer_type")
+				: getString("_UI_Layer_type") + " " + label;
+	}
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(Layer.class)) {
+		case BuildingPhysicsPackage.LAYER__THICKNESS:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		return BuildingPhysicsEditPlugin.INSTANCE;
+	}
+
+}

de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/MaterialCatalogItemProvider.java

@@ -62,6 +62,7 @@ public class MaterialCatalogItemProvider extends CatalogItemProvider {
 		if (childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(BuildingPhysicsPackage.Literals.MATERIAL_CATALOG__MATERIAL_CATEGORIES);
+			childrenFeatures.add(BuildingPhysicsPackage.Literals.MATERIAL_CATALOG__CONSTRUCTION_CATEGORIES);
 		}
 		return childrenFeatures;
 	}
@@ -126,6 +127,7 @@ public class MaterialCatalogItemProvider extends CatalogItemProvider {
 
 		switch (notification.getFeatureID(MaterialCatalog.class)) {
 		case BuildingPhysicsPackage.MATERIAL_CATALOG__MATERIAL_CATEGORIES:
+		case BuildingPhysicsPackage.MATERIAL_CATALOG__CONSTRUCTION_CATEGORIES:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 			return;
 		}
@@ -146,6 +148,10 @@ public class MaterialCatalogItemProvider extends CatalogItemProvider {
 		newChildDescriptors
 				.add(createChildParameter(BuildingPhysicsPackage.Literals.MATERIAL_CATALOG__MATERIAL_CATEGORIES,
 						BuildingPhysicsFactory.eINSTANCE.createMaterialCategory()));
+
+		newChildDescriptors
+				.add(createChildParameter(BuildingPhysicsPackage.Literals.MATERIAL_CATALOG__CONSTRUCTION_CATEGORIES,
+						BuildingPhysicsFactory.eINSTANCE.createConstructionCategory()));
 	}
 
 }

de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/MaterialCategoryItemProvider.java

@@ -89,7 +89,7 @@ public class MaterialCategoryItemProvider extends ItemProviderAdapter implements
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
 		if (childrenFeatures == null) {
 			super.getChildrenFeatures(object);
-			childrenFeatures.add(BuildingPhysicsPackage.Literals.MATERIAL_CATEGORY__MATERIAL);
+			childrenFeatures.add(BuildingPhysicsPackage.Literals.MATERIAL_CATEGORY__MATERIALS);
 		}
 		return childrenFeatures;
 	}
@@ -156,7 +156,7 @@ public class MaterialCategoryItemProvider extends ItemProviderAdapter implements
 		case BuildingPhysicsPackage.MATERIAL_CATEGORY__NAME:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 			return;
-		case BuildingPhysicsPackage.MATERIAL_CATEGORY__MATERIAL:
+		case BuildingPhysicsPackage.MATERIAL_CATEGORY__MATERIALS:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 			return;
 		}
@@ -174,7 +174,7 @@ public class MaterialCategoryItemProvider extends ItemProviderAdapter implements
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add(createChildParameter(BuildingPhysicsPackage.Literals.MATERIAL_CATEGORY__MATERIAL,
+		newChildDescriptors.add(createChildParameter(BuildingPhysicsPackage.Literals.MATERIAL_CATEGORY__MATERIALS,
 				BuildingPhysicsFactory.eINSTANCE.createMaterial()));
 	}
 

de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/MaterialItemProvider.java

@@ -53,7 +53,7 @@ public class MaterialItemProvider extends ItemProviderAdapter implements IEditin
 		if (itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 
-			addIdPropertyDescriptor(object);
+			addMaterialIdPropertyDescriptor(object);
 			addNamePropertyDescriptor(object);
 			addDensityPropertyDescriptor(object);
 			addHeatCapacityPropertyDescriptor(object);
@@ -69,18 +69,19 @@ public class MaterialItemProvider extends ItemProviderAdapter implements IEditin
 	}
 
 	/**
-	 * This adds a property descriptor for the Id feature.
+	 * This adds a property descriptor for the Material Id feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected void addIdPropertyDescriptor(Object object) {
+	protected void addMaterialIdPropertyDescriptor(Object object) {
 		itemPropertyDescriptors
 				.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(), getString("_UI_Material_id_feature"),
-						getString("_UI_PropertyDescriptor_description", "_UI_Material_id_feature", "_UI_Material_type"),
-						BuildingPhysicsPackage.Literals.MATERIAL__ID, true, false, false,
-						ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
+						getResourceLocator(), getString("_UI_Material_materialId_feature"),
+						getString("_UI_PropertyDescriptor_description", "_UI_Material_materialId_feature",
+								"_UI_Material_type"),
+						BuildingPhysicsPackage.Literals.MATERIAL__MATERIAL_ID, true, false, false,
+						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -289,7 +290,7 @@ public class MaterialItemProvider extends ItemProviderAdapter implements IEditin
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(Material.class)) {
-		case BuildingPhysicsPackage.MATERIAL__ID:
+		case BuildingPhysicsPackage.MATERIAL__MATERIAL_ID:
 		case BuildingPhysicsPackage.MATERIAL__NAME:
 		case BuildingPhysicsPackage.MATERIAL__DENSITY:
 		case BuildingPhysicsPackage.MATERIAL__HEAT_CAPACITY:

de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/MountingItemProvider.java

+/**
+ */
+package de.hftstuttgart.buildingphysics.provider;
+
+import de.hftstuttgart.buildingphysics.BuildingPhysicsFactory;
+import de.hftstuttgart.buildingphysics.BuildingPhysicsPackage;
+import de.hftstuttgart.buildingphysics.Mounting;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.common.util.ResourceLocator;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemProviderAdapter;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+
+/**
+ * This is the item provider adapter for a {@link de.hftstuttgart.buildingphysics.Mounting} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class MountingItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
+		IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public MountingItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addMountingIdPropertyDescriptor(object);
+			addNamePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Mounting Id feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addMountingIdPropertyDescriptor(Object object) {
+		itemPropertyDescriptors
+				.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+						getResourceLocator(), getString("_UI_Mounting_mountingId_feature"),
+						getString("_UI_PropertyDescriptor_description", "_UI_Mounting_mountingId_feature",
+								"_UI_Mounting_type"),
+						BuildingPhysicsPackage.Literals.MOUNTING__MOUNTING_ID, true, false, false,
+						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Name feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addNamePropertyDescriptor(Object object) {
+		itemPropertyDescriptors
+				.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+						getResourceLocator(), getString("_UI_Mounting_name_feature"),
+						getString("_UI_PropertyDescriptor_description", "_UI_Mounting_name_feature",
+								"_UI_Mounting_type"),
+						BuildingPhysicsPackage.Literals.MOUNTING__NAME, true, false, false,
+						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+	}
+
+	/**
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if (childrenFeatures == null) {
+			super.getChildrenFeatures(object);
+			childrenFeatures.add(BuildingPhysicsPackage.Literals.MOUNTING__LAYERS);
+		}
+		return childrenFeatures;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EStructuralFeature getChildFeature(Object object, Object child) {
+		// Check the type of the specified child object and return the proper feature to use for
+		// adding (see {@link AddCommand}) it as a child.
+
+		return super.getChildFeature(object, child);
+	}
+
+	/**
+	 * This returns Mounting.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/Mounting"));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected boolean shouldComposeCreationImage() {
+		return true;
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((Mounting) object).getName();
+		return label == null || label.length() == 0 ? getString("_UI_Mounting_type")
+				: getString("_UI_Mounting_type") + " " + label;
+	}
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(Mounting.class)) {
+		case BuildingPhysicsPackage.MOUNTING__MOUNTING_ID:
+		case BuildingPhysicsPackage.MOUNTING__NAME:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case BuildingPhysicsPackage.MOUNTING__LAYERS:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+
+		newChildDescriptors.add(createChildParameter(BuildingPhysicsPackage.Literals.MOUNTING__LAYERS,
+				BuildingPhysicsFactory.eINSTANCE.createLayer()));
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		return BuildingPhysicsEditPlugin.INSTANCE;
+	}
+
+}

de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/WindowTypeItemProvider.java

@@ -53,7 +53,7 @@ public class WindowTypeItemProvider extends ItemProviderAdapter implements IEdit
 		if (itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 
-			addIdPropertyDescriptor(object);
+			addWindowTypeIdPropertyDescriptor(object);
 			addNamePropertyDescriptor(object);
 			addUValuePropertyDescriptor(object);
 			addGValuePropertyDescriptor(object);
@@ -70,19 +70,19 @@ public class WindowTypeItemProvider extends ItemProviderAdapter implements IEdit
 	}
 
 	/**
-	 * This adds a property descriptor for the Id feature.
+	 * This adds a property descriptor for the Window Type Id feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected void addIdPropertyDescriptor(Object object) {
+	protected void addWindowTypeIdPropertyDescriptor(Object object) {
 		itemPropertyDescriptors
 				.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(), getString("_UI_WindowType_id_feature"),
-						getString("_UI_PropertyDescriptor_description", "_UI_WindowType_id_feature",
+						getResourceLocator(), getString("_UI_WindowType_windowTypeId_feature"),
+						getString("_UI_PropertyDescriptor_description", "_UI_WindowType_windowTypeId_feature",
 								"_UI_WindowType_type"),
-						BuildingPhysicsPackage.Literals.WINDOW_TYPE__ID, true, false, false,
-						ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
+						BuildingPhysicsPackage.Literals.WINDOW_TYPE__WINDOW_TYPE_ID, true, false, false,
+						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -307,7 +307,7 @@ public class WindowTypeItemProvider extends ItemProviderAdapter implements IEdit
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(WindowType.class)) {
-		case BuildingPhysicsPackage.WINDOW_TYPE__ID:
+		case BuildingPhysicsPackage.WINDOW_TYPE__WINDOW_TYPE_ID:
 		case BuildingPhysicsPackage.WINDOW_TYPE__NAME:
 		case BuildingPhysicsPackage.WINDOW_TYPE__UVALUE:
 		case BuildingPhysicsPackage.WINDOW_TYPE__GVALUE:

de.hftstuttgart.buildingphysics.viewmodel/viewmodels/Material.view

 <?xml version="1.0" encoding="UTF-8"?>
 <org.eclipse.emf.ecp.view.model:View xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:org.eclipse.emf.ecp.view.group.model="http://org/eclipse/emf/ecp/view/group/model" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmi:id="_bUohgK22Eeup29SeaUMpQQ" name="Material">
   <rootEClass href="http://www.hftstuttgart.de/buildingphysics#//Material"/>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_bUpvoK22Eeup29SeaUMpQQ" name="Control id">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_bUpvoa22Eeup29SeaUMpQQ">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.hftstuttgart.de/buildingphysics#//Material/id"/>
-    </domainModelReference>
-  </children>
   <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_bUpvoq22Eeup29SeaUMpQQ" name="Control name">
     <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_bUpvo622Eeup29SeaUMpQQ">
       <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.hftstuttgart.de/buildingphysics#//Material/name"/>

de.hftstuttgart.buildingphysics.viewmodel/viewmodels/MaterialCategory.view

 <?xml version="1.0" encoding="UTF-8"?>
 <org.eclipse.emf.ecp.view.model:View xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmlns:org.eclipse.emf.ecp.view.table.model="http://org/eclipse/emf/ecp/view/table/model/150" xmi:id="_ZY8TECUNEeux0PTSTJn6xg" name="MaterialCategory">
   <rootEClass href="http://www.hftstuttgart.de/buildingphysics#//MaterialCategory"/>
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_kT3mkLMKEeup29SeaUMpQQ" name="Control name">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_kT3mkbMKEeup29SeaUMpQQ">
+      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.hftstuttgart.de/buildingphysics#//MaterialCategory/name"/>
+    </domainModelReference>
+  </children>
   <children xsi:type="org.eclipse.emf.ecp.view.table.model:TableControl" xmi:id="_cQS6sCUNEeux0PTSTJn6xg" detailEditing="WithPanel">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.table.model:TableDomainModelReference" xmi:id="_6djXAKg0EeuFa-L9J4DlVg">
-      <columnDomainModelReferences xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Qi7ScK22Eeup29SeaUMpQQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.hftstuttgart.de/buildingphysics#//Material/id"/>
-      </columnDomainModelReferences>
-      <columnDomainModelReferences xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Qi7Sca22Eeup29SeaUMpQQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.hftstuttgart.de/buildingphysics#//Material/name"/>
-      </columnDomainModelReferences>
-      <columnDomainModelReferences xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Qi7Scq22Eeup29SeaUMpQQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.hftstuttgart.de/buildingphysics#//Material/density"/>
-      </columnDomainModelReferences>
-      <columnDomainModelReferences xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Qi7Sc622Eeup29SeaUMpQQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.hftstuttgart.de/buildingphysics#//Material/heatCapacity"/>
-      </columnDomainModelReferences>
-      <columnDomainModelReferences xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Qi7SdK22Eeup29SeaUMpQQ">
-        <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.hftstuttgart.de/buildingphysics#//Material/conductivity"/>
-      </columnDomainModelReferences>
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.table.model:TableDomainModelReference" xmi:id="_6djXAag0EeuFa-L9J4DlVg">
-        <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_6djXAqg0EeuFa-L9J4DlVg">
-          <domainModelEFeature xsi:type="ecore:EReference" href="http://www.hftstuttgart.de/buildingphysics#//MaterialCategory/material"/>
-        </domainModelReference>
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.table.model:TableDomainModelReference" xmi:id="_off5gLMKEeup29SeaUMpQQ">
+      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_off5gbMKEeup29SeaUMpQQ">
+        <domainModelEFeature xsi:type="ecore:EReference" href="http://www.hftstuttgart.de/buildingphysics#//MaterialCategory/materials"/>
       </domainModelReference>
     </domainModelReference>
   </children>

de.hftstuttgart.buildingphysics.viewmodel/viewmodels/WindowType.view

 <?xml version="1.0" encoding="UTF-8"?>
 <org.eclipse.emf.ecp.view.model:View xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:org.eclipse.emf.ecp.view.group.model="http://org/eclipse/emf/ecp/view/group/model" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmi:id="_7hNMIK21Eeup29SeaUMpQQ" name="WindowType">
   <rootEClass href="http://www.hftstuttgart.de/buildingphysics#//WindowType"/>
-  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_7hPBUK21Eeup29SeaUMpQQ" name="Control id">
-    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_7hPBUa21Eeup29SeaUMpQQ">
-      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.hftstuttgart.de/buildingphysics#//WindowType/id"/>
-    </domainModelReference>
-  </children>
   <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_7hPBUq21Eeup29SeaUMpQQ" name="Control name">
     <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_7hPBU621Eeup29SeaUMpQQ">
       <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.hftstuttgart.de/buildingphysics#//WindowType/name"/>

de.hftstuttgart.buildingphysics/model/buildingphysics.ecore

@@ -11,8 +11,8 @@
         eType="#//MaterialCatalog" containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="WindowType">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
-        iD="true"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="windowTypeId" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="uValue" lowerBound="1"
         eType="ecore:EDataType ../../de.hftstuttgart.cityunits.model/model/Quantities.ecore#//QuantityDouble"
@@ -60,15 +60,17 @@
   <eClassifiers xsi:type="ecore:EClass" name="MaterialCatalog" eSuperTypes="#//Catalog">
     <eStructuralFeatures xsi:type="ecore:EReference" name="materialCategories" upperBound="-1"
         eType="#//MaterialCategory" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="constructionCategories"
+        lowerBound="1" upperBound="-1" eType="#//ConstructionCategory" containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="MaterialCategory">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="material" upperBound="-1"
+    <eStructuralFeatures xsi:type="ecore:EReference" name="materials" upperBound="-1"
         eType="#//Material" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Material">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong"
-        iD="true"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="materialId" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" iD="true"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="density" lowerBound="1"
         eType="ecore:EDataType ../../de.hftstuttgart.cityunits.model/model/Quantities.ecore#//QuantityDouble"
@@ -96,4 +98,23 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="disposalDescription" lowerBound="1"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ConstructionCategory">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="mountings" upperBound="-1"
+        eType="#//Mounting" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Mounting">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="mountingId" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="layers" lowerBound="1"
+        upperBound="-1" eType="#//Layer" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Layer">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="material" unique="false"
+        lowerBound="1" eType="#//Material" eKeys="#//Material/materialId"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="thickness" lowerBound="1"
+        eType="ecore:EDataType ../../de.hftstuttgart.cityunits.model/model/Quantities.ecore#//QuantityDouble"
+        defaultValueLiteral="m"/>
+  </eClassifiers>
 </ecore:EPackage>

de.hftstuttgart.buildingphysics/model/buildingphysics.genmodel

@@ -17,7 +17,7 @@
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference buildingphysics.ecore#//BuildingPhysicsCatalog/materialCatalog"/>
     </genClasses>
     <genClasses ecoreClass="buildingphysics.ecore#//WindowType">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//WindowType/id"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//WindowType/windowTypeId"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//WindowType/name"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//WindowType/uValue"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//WindowType/gValue"/>
@@ -40,13 +40,14 @@
     </genClasses>
     <genClasses ecoreClass="buildingphysics.ecore#//MaterialCatalog">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference buildingphysics.ecore#//MaterialCatalog/materialCategories"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference buildingphysics.ecore#//MaterialCatalog/constructionCategories"/>
     </genClasses>
     <genClasses ecoreClass="buildingphysics.ecore#//MaterialCategory">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference buildingphysics.ecore#//MaterialCategory/material"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference buildingphysics.ecore#//MaterialCategory/materials"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//MaterialCategory/name"/>
     </genClasses>
     <genClasses ecoreClass="buildingphysics.ecore#//Material">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Material/id"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Material/materialId"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Material/name"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Material/density"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Material/heatCapacity"/>
@@ -58,5 +59,19 @@
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Material/disposalCarbon"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Material/disposalDescription"/>
     </genClasses>
+    <genClasses ecoreClass="buildingphysics.ecore#//ConstructionCategory">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//ConstructionCategory/name"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference buildingphysics.ecore#//ConstructionCategory/mountings"/>
+    </genClasses>
+    <genClasses ecoreClass="buildingphysics.ecore#//Mounting">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Mounting/mountingId"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Mounting/name"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference buildingphysics.ecore#//Mounting/layers"/>
+    </genClasses>
+    <genClasses ecoreClass="buildingphysics.ecore#//Layer">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference buildingphysics.ecore#//Layer/material"
+          suppressedGetVisibility="false" suppressedSetVisibility="false"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Layer/thickness"/>
+    </genClasses>
   </genPackages>
 </genmodel:GenModel>

de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/BuildingPhysicsFactory.java

@@ -75,6 +75,33 @@ public interface BuildingPhysicsFactory extends EFactory {
 	 */
 	Material createMaterial();
 
+	/**
+	 * Returns a new object of class '<em>Construction Category</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Construction Category</em>'.
+	 * @generated
+	 */
+	ConstructionCategory createConstructionCategory();
+
+	/**
+	 * Returns a new object of class '<em>Mounting</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Mounting</em>'.
+	 * @generated
+	 */
+	Mounting createMounting();
+
+	/**
+	 * Returns a new object of class '<em>Layer</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Layer</em>'.
+	 * @generated
+	 */
+	Layer createLayer();
+
 	/**
 	 * Returns the package supported by this factory.
 	 * <!-- begin-user-doc -->

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

@@ -122,13 +122,13 @@ public interface BuildingPhysicsPackage extends EPackage {
 	int WINDOW_TYPE = 1;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
+	 * The feature id for the '<em><b>Window Type Id</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int WINDOW_TYPE__ID = 0;
+	int WINDOW_TYPE__WINDOW_TYPE_ID = 0;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -412,6 +412,15 @@ public interface BuildingPhysicsPackage extends EPackage {
 	 */
 	int MATERIAL_CATALOG__MATERIAL_CATEGORIES = CATALOG_FEATURE_COUNT + 0;
 
+	/**
+	 * The feature id for the '<em><b>Construction Categories</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MATERIAL_CATALOG__CONSTRUCTION_CATEGORIES = CATALOG_FEATURE_COUNT + 1;
+
 	/**
 	 * The number of structural features of the '<em>Material Catalog</em>' class.
 	 * <!-- begin-user-doc -->
@@ -419,7 +428,7 @@ public interface BuildingPhysicsPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int MATERIAL_CATALOG_FEATURE_COUNT = CATALOG_FEATURE_COUNT + 1;
+	int MATERIAL_CATALOG_FEATURE_COUNT = CATALOG_FEATURE_COUNT + 2;
 
 	/**
 	 * The number of operations of the '<em>Material Catalog</em>' class.
@@ -441,13 +450,13 @@ public interface BuildingPhysicsPackage extends EPackage {
 	int MATERIAL_CATEGORY = 5;
 
 	/**
-	 * The feature id for the '<em><b>Material</b></em>' containment reference list.
+	 * The feature id for the '<em><b>Materials</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int MATERIAL_CATEGORY__MATERIAL = 0;
+	int MATERIAL_CATEGORY__MATERIALS = 0;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -487,13 +496,13 @@ public interface BuildingPhysicsPackage extends EPackage {
 	int MATERIAL = 6;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
+	 * The feature id for the '<em><b>Material Id</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int MATERIAL__ID = 0;
+	int MATERIAL__MATERIAL_ID = 0;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -603,6 +612,153 @@ public interface BuildingPhysicsPackage extends EPackage {
 	 */
 	int MATERIAL_OPERATION_COUNT = 0;
 
+	/**
+	 * The meta object id for the '{@link de.hftstuttgart.buildingphysics.impl.ConstructionCategoryImpl <em>Construction Category</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see de.hftstuttgart.buildingphysics.impl.ConstructionCategoryImpl
+	 * @see de.hftstuttgart.buildingphysics.impl.BuildingPhysicsPackageImpl#getConstructionCategory()
+	 * @generated
+	 */
+	int CONSTRUCTION_CATEGORY = 7;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONSTRUCTION_CATEGORY__NAME = 0;
+
+	/**
+	 * The feature id for the '<em><b>Mountings</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONSTRUCTION_CATEGORY__MOUNTINGS = 1;
+
+	/**
+	 * The number of structural features of the '<em>Construction Category</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONSTRUCTION_CATEGORY_FEATURE_COUNT = 2;
+
+	/**
+	 * The number of operations of the '<em>Construction Category</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONSTRUCTION_CATEGORY_OPERATION_COUNT = 0;
+
+	/**
+	 * The meta object id for the '{@link de.hftstuttgart.buildingphysics.impl.MountingImpl <em>Mounting</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see de.hftstuttgart.buildingphysics.impl.MountingImpl
+	 * @see de.hftstuttgart.buildingphysics.impl.BuildingPhysicsPackageImpl#getMounting()
+	 * @generated
+	 */
+	int MOUNTING = 8;
+
+	/**
+	 * The feature id for the '<em><b>Mounting Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MOUNTING__MOUNTING_ID = 0;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MOUNTING__NAME = 1;
+
+	/**
+	 * The feature id for the '<em><b>Layers</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MOUNTING__LAYERS = 2;
+
+	/**
+	 * The number of structural features of the '<em>Mounting</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MOUNTING_FEATURE_COUNT = 3;
+
+	/**
+	 * The number of operations of the '<em>Mounting</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MOUNTING_OPERATION_COUNT = 0;
+
+	/**
+	 * The meta object id for the '{@link de.hftstuttgart.buildingphysics.impl.LayerImpl <em>Layer</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see de.hftstuttgart.buildingphysics.impl.LayerImpl
+	 * @see de.hftstuttgart.buildingphysics.impl.BuildingPhysicsPackageImpl#getLayer()
+	 * @generated
+	 */
+	int LAYER = 9;
+
+	/**
+	 * The feature id for the '<em><b>Material</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LAYER__MATERIAL = 0;
+
+	/**
+	 * The feature id for the '<em><b>Thickness</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LAYER__THICKNESS = 1;
+
+	/**
+	 * The number of structural features of the '<em>Layer</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LAYER_FEATURE_COUNT = 2;
+
+	/**
+	 * The number of operations of the '<em>Layer</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LAYER_OPERATION_COUNT = 0;
+
 	/**
 	 * Returns the meta object for class '{@link de.hftstuttgart.buildingphysics.BuildingPhysicsCatalog <em>Catalog</em>}'.
 	 * <!-- begin-user-doc -->
@@ -657,15 +813,15 @@ public interface BuildingPhysicsPackage extends EPackage {
 	EClass getWindowType();
 
 	/**
-	 * Returns the meta object for the attribute '{@link de.hftstuttgart.buildingphysics.WindowType#getId <em>Id</em>}'.
+	 * Returns the meta object for the attribute '{@link de.hftstuttgart.buildingphysics.WindowType#getWindowTypeId <em>Window Type Id</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see de.hftstuttgart.buildingphysics.WindowType#getId()
+	 * @return the meta object for the attribute '<em>Window Type Id</em>'.
+	 * @see de.hftstuttgart.buildingphysics.WindowType#getWindowTypeId()
 	 * @see #getWindowType()
 	 * @generated
 	 */
-	EAttribute getWindowType_Id();
+	EAttribute getWindowType_WindowTypeId();
 
 	/**
 	 * Returns the meta object for the attribute '{@link de.hftstuttgart.buildingphysics.WindowType#getName <em>Name</em>}'.
@@ -873,6 +1029,17 @@ public interface BuildingPhysicsPackage extends EPackage {
 	 */
 	EReference getMaterialCatalog_MaterialCategories();
 
+	/**
+	 * Returns the meta object for the containment reference list '{@link de.hftstuttgart.buildingphysics.MaterialCatalog#getConstructionCategories <em>Construction Categories</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Construction Categories</em>'.
+	 * @see de.hftstuttgart.buildingphysics.MaterialCatalog#getConstructionCategories()
+	 * @see #getMaterialCatalog()
+	 * @generated
+	 */
+	EReference getMaterialCatalog_ConstructionCategories();
+
 	/**
 	 * Returns the meta object for class '{@link de.hftstuttgart.buildingphysics.MaterialCategory <em>Material Category</em>}'.
 	 * <!-- begin-user-doc -->
@@ -884,15 +1051,15 @@ public interface BuildingPhysicsPackage extends EPackage {
 	EClass getMaterialCategory();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link de.hftstuttgart.buildingphysics.MaterialCategory#getMaterial <em>Material</em>}'.
+	 * Returns the meta object for the containment reference list '{@link de.hftstuttgart.buildingphysics.MaterialCategory#getMaterials <em>Materials</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Material</em>'.
-	 * @see de.hftstuttgart.buildingphysics.MaterialCategory#getMaterial()
+	 * @return the meta object for the containment reference list '<em>Materials</em>'.
+	 * @see de.hftstuttgart.buildingphysics.MaterialCategory#getMaterials()
 	 * @see #getMaterialCategory()
 	 * @generated
 	 */
-	EReference getMaterialCategory_Material();
+	EReference getMaterialCategory_Materials();
 
 	/**
 	 * Returns the meta object for the attribute '{@link de.hftstuttgart.buildingphysics.MaterialCategory#getName <em>Name</em>}'.
@@ -916,15 +1083,15 @@ public interface BuildingPhysicsPackage extends EPackage {
 	EClass getMaterial();
 
 	/**
-	 * Returns the meta object for the attribute '{@link de.hftstuttgart.buildingphysics.Material#getId <em>Id</em>}'.
+	 * Returns the meta object for the attribute '{@link de.hftstuttgart.buildingphysics.Material#getMaterialId <em>Material Id</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see de.hftstuttgart.buildingphysics.Material#getId()
+	 * @return the meta object for the attribute '<em>Material Id</em>'.
+	 * @see de.hftstuttgart.buildingphysics.Material#getMaterialId()
 	 * @see #getMaterial()
 	 * @generated
 	 */
-	EAttribute getMaterial_Id();
+	EAttribute getMaterial_MaterialId();
 
 	/**
 	 * Returns the meta object for the attribute '{@link de.hftstuttgart.buildingphysics.Material#getName <em>Name</em>}'.
@@ -1036,6 +1203,113 @@ public interface BuildingPhysicsPackage extends EPackage {
 	 */
 	EAttribute getMaterial_DisposalDescription();
 
+	/**
+	 * Returns the meta object for class '{@link de.hftstuttgart.buildingphysics.ConstructionCategory <em>Construction Category</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Construction Category</em>'.
+	 * @see de.hftstuttgart.buildingphysics.ConstructionCategory
+	 * @generated
+	 */
+	EClass getConstructionCategory();
+
+	/**
+	 * Returns the meta object for the attribute '{@link de.hftstuttgart.buildingphysics.ConstructionCategory#getName <em>Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Name</em>'.
+	 * @see de.hftstuttgart.buildingphysics.ConstructionCategory#getName()
+	 * @see #getConstructionCategory()
+	 * @generated
+	 */
+	EAttribute getConstructionCategory_Name();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link de.hftstuttgart.buildingphysics.ConstructionCategory#getMountings <em>Mountings</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Mountings</em>'.
+	 * @see de.hftstuttgart.buildingphysics.ConstructionCategory#getMountings()
+	 * @see #getConstructionCategory()
+	 * @generated
+	 */
+	EReference getConstructionCategory_Mountings();
+
+	/**
+	 * Returns the meta object for class '{@link de.hftstuttgart.buildingphysics.Mounting <em>Mounting</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Mounting</em>'.
+	 * @see de.hftstuttgart.buildingphysics.Mounting
+	 * @generated
+	 */
+	EClass getMounting();
+
+	/**
+	 * Returns the meta object for the attribute '{@link de.hftstuttgart.buildingphysics.Mounting#getMountingId <em>Mounting Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Mounting Id</em>'.
+	 * @see de.hftstuttgart.buildingphysics.Mounting#getMountingId()
+	 * @see #getMounting()
+	 * @generated
+	 */
+	EAttribute getMounting_MountingId();
+
+	/**
+	 * Returns the meta object for the attribute '{@link de.hftstuttgart.buildingphysics.Mounting#getName <em>Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Name</em>'.
+	 * @see de.hftstuttgart.buildingphysics.Mounting#getName()
+	 * @see #getMounting()
+	 * @generated
+	 */
+	EAttribute getMounting_Name();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link de.hftstuttgart.buildingphysics.Mounting#getLayers <em>Layers</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Layers</em>'.
+	 * @see de.hftstuttgart.buildingphysics.Mounting#getLayers()
+	 * @see #getMounting()
+	 * @generated
+	 */
+	EReference getMounting_Layers();
+
+	/**
+	 * Returns the meta object for class '{@link de.hftstuttgart.buildingphysics.Layer <em>Layer</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Layer</em>'.
+	 * @see de.hftstuttgart.buildingphysics.Layer
+	 * @generated
+	 */
+	EClass getLayer();
+
+	/**
+	 * Returns the meta object for the reference '{@link de.hftstuttgart.buildingphysics.Layer#getMaterial <em>Material</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Material</em>'.
+	 * @see de.hftstuttgart.buildingphysics.Layer#getMaterial()
+	 * @see #getLayer()
+	 * @generated
+	 */
+	EReference getLayer_Material();
+
+	/**
+	 * Returns the meta object for the attribute '{@link de.hftstuttgart.buildingphysics.Layer#getThickness <em>Thickness</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Thickness</em>'.
+	 * @see de.hftstuttgart.buildingphysics.Layer#getThickness()
+	 * @see #getLayer()
+	 * @generated
+	 */
+	EAttribute getLayer_Thickness();
+
 	/**
 	 * Returns the factory that creates the instances of the model.
 	 * <!-- begin-user-doc -->
@@ -1104,12 +1378,12 @@ public interface BuildingPhysicsPackage extends EPackage {
 		EClass WINDOW_TYPE = eINSTANCE.getWindowType();
 
 		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
+		 * The meta object literal for the '<em><b>Window Type Id</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute WINDOW_TYPE__ID = eINSTANCE.getWindowType_Id();
+		EAttribute WINDOW_TYPE__WINDOW_TYPE_ID = eINSTANCE.getWindowType_WindowTypeId();
 
 		/**
 		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
@@ -1269,6 +1543,14 @@ public interface BuildingPhysicsPackage extends EPackage {
 		 */
 		EReference MATERIAL_CATALOG__MATERIAL_CATEGORIES = eINSTANCE.getMaterialCatalog_MaterialCategories();
 
+		/**
+		 * The meta object literal for the '<em><b>Construction Categories</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference MATERIAL_CATALOG__CONSTRUCTION_CATEGORIES = eINSTANCE.getMaterialCatalog_ConstructionCategories();
+
 		/**
 		 * The meta object literal for the '{@link de.hftstuttgart.buildingphysics.impl.MaterialCategoryImpl <em>Material Category</em>}' class.
 		 * <!-- begin-user-doc -->
@@ -1280,12 +1562,12 @@ public interface BuildingPhysicsPackage extends EPackage {
 		EClass MATERIAL_CATEGORY = eINSTANCE.getMaterialCategory();
 
 		/**
-		 * The meta object literal for the '<em><b>Material</b></em>' containment reference list feature.
+		 * The meta object literal for the '<em><b>Materials</b></em>' containment reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference MATERIAL_CATEGORY__MATERIAL = eINSTANCE.getMaterialCategory_Material();
+		EReference MATERIAL_CATEGORY__MATERIALS = eINSTANCE.getMaterialCategory_Materials();
 
 		/**
 		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
@@ -1306,12 +1588,12 @@ public interface BuildingPhysicsPackage extends EPackage {
 		EClass MATERIAL = eINSTANCE.getMaterial();
 
 		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
+		 * The meta object literal for the '<em><b>Material Id</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute MATERIAL__ID = eINSTANCE.getMaterial_Id();
+		EAttribute MATERIAL__MATERIAL_ID = eINSTANCE.getMaterial_MaterialId();
 
 		/**
 		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
@@ -1393,6 +1675,92 @@ public interface BuildingPhysicsPackage extends EPackage {
 		 */
 		EAttribute MATERIAL__DISPOSAL_DESCRIPTION = eINSTANCE.getMaterial_DisposalDescription();
 
+		/**
+		 * The meta object literal for the '{@link de.hftstuttgart.buildingphysics.impl.ConstructionCategoryImpl <em>Construction Category</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see de.hftstuttgart.buildingphysics.impl.ConstructionCategoryImpl
+		 * @see de.hftstuttgart.buildingphysics.impl.BuildingPhysicsPackageImpl#getConstructionCategory()
+		 * @generated
+		 */
+		EClass CONSTRUCTION_CATEGORY = eINSTANCE.getConstructionCategory();
+
+		/**
+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CONSTRUCTION_CATEGORY__NAME = eINSTANCE.getConstructionCategory_Name();
+
+		/**
+		 * The meta object literal for the '<em><b>Mountings</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference CONSTRUCTION_CATEGORY__MOUNTINGS = eINSTANCE.getConstructionCategory_Mountings();
+
+		/**
+		 * The meta object literal for the '{@link de.hftstuttgart.buildingphysics.impl.MountingImpl <em>Mounting</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see de.hftstuttgart.buildingphysics.impl.MountingImpl
+		 * @see de.hftstuttgart.buildingphysics.impl.BuildingPhysicsPackageImpl#getMounting()
+		 * @generated
+		 */
+		EClass MOUNTING = eINSTANCE.getMounting();
+
+		/**
+		 * The meta object literal for the '<em><b>Mounting Id</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute MOUNTING__MOUNTING_ID = eINSTANCE.getMounting_MountingId();
+
+		/**
+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute MOUNTING__NAME = eINSTANCE.getMounting_Name();
+
+		/**
+		 * The meta object literal for the '<em><b>Layers</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference MOUNTING__LAYERS = eINSTANCE.getMounting_Layers();
+
+		/**
+		 * The meta object literal for the '{@link de.hftstuttgart.buildingphysics.impl.LayerImpl <em>Layer</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see de.hftstuttgart.buildingphysics.impl.LayerImpl
+		 * @see de.hftstuttgart.buildingphysics.impl.BuildingPhysicsPackageImpl#getLayer()
+		 * @generated
+		 */
+		EClass LAYER = eINSTANCE.getLayer();
+
+		/**
+		 * The meta object literal for the '<em><b>Material</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference LAYER__MATERIAL = eINSTANCE.getLayer_Material();
+
+		/**
+		 * The meta object literal for the '<em><b>Thickness</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute LAYER__THICKNESS = eINSTANCE.getLayer_Thickness();
+
 	}
 
 } //BuildingPhysicsPackage