Commit 7d014334 authored by Kai-Holger Brassel's avatar Kai-Holger Brassel
Browse files

Rename Mounting to Construction

parent f80d5e31
......@@ -70,21 +70,20 @@ _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_Mounting_type = Mounting
_UI_Layer_type = Layer
_UI_MaterialCatalog_constructionCategories_feature = Constructions
_UI_ConstructionCategory_name_feature = Construction Category
_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 = Layer
_UI_Material_category_feature = Category
_UI_MaterialCategory_name_description = Name of material category
_UI_Material_name_description = Name of material
_UI_Construction_type = Construction
_UI_ConstructionCategory_constructions_feature = Constructions
_UI_Construction_constructionId_feature = Construction Id
_UI_Construction_name_feature = Name
_UI_Construction_layers_feature = Layers
......@@ -234,26 +234,26 @@ public class BuildingPhysicsItemProviderAdapterFactory extends BuildingPhysicsAd
}
/**
* This keeps track of the one adapter used for all {@link de.hftstuttgart.buildingphysics.Mounting} instances.
* This keeps track of the one adapter used for all {@link de.hftstuttgart.buildingphysics.Construction} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected MountingItemProvider mountingItemProvider;
protected ConstructionItemProvider constructionItemProvider;
/**
* This creates an adapter for a {@link de.hftstuttgart.buildingphysics.Mounting}.
* This creates an adapter for a {@link de.hftstuttgart.buildingphysics.Construction}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
public Adapter createMountingAdapter() {
if (mountingItemProvider == null) {
mountingItemProvider = new MountingItemProvider(this);
public Adapter createConstructionAdapter() {
if (constructionItemProvider == null) {
constructionItemProvider = new ConstructionItemProvider(this);
}
return mountingItemProvider;
return constructionItemProvider;
}
/**
......@@ -398,8 +398,8 @@ public class BuildingPhysicsItemProviderAdapterFactory extends BuildingPhysicsAd
materialItemProvider.dispose();
if (constructionCategoryItemProvider != null)
constructionCategoryItemProvider.dispose();
if (mountingItemProvider != null)
mountingItemProvider.dispose();
if (constructionItemProvider != null)
constructionItemProvider.dispose();
if (layerItemProvider != null)
layerItemProvider.dispose();
}
......
......@@ -12,6 +12,7 @@ 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;
......@@ -120,7 +121,7 @@ public class ConstructionCategoryItemProvider extends ItemProviderAdapter implem
switch (notification.getFeatureID(ConstructionCategory.class)) {
case BuildingPhysicsPackage.CONSTRUCTION_CATEGORY__NAME:
case BuildingPhysicsPackage.CONSTRUCTION_CATEGORY__MOUNTINGS:
case BuildingPhysicsPackage.CONSTRUCTION_CATEGORY__CONSTRUCTIONS:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
}
......
......@@ -4,7 +4,7 @@ package de.hftstuttgart.buildingphysics.provider;
import de.hftstuttgart.buildingphysics.BuildingPhysicsFactory;
import de.hftstuttgart.buildingphysics.BuildingPhysicsPackage;
import de.hftstuttgart.buildingphysics.Mounting;
import de.hftstuttgart.buildingphysics.Construction;
import java.util.Collection;
import java.util.List;
......@@ -28,12 +28,12 @@ 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.
* This is the item provider adapter for a {@link de.hftstuttgart.buildingphysics.Construction} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
public class MountingItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
public class ConstructionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
/**
* This constructs an instance from a factory and a notifier.
......@@ -41,7 +41,7 @@ public class MountingItemProvider extends ItemProviderAdapter implements IEditin
* <!-- end-user-doc -->
* @generated
*/
public MountingItemProvider(AdapterFactory adapterFactory) {
public ConstructionItemProvider(AdapterFactory adapterFactory) {
super(adapterFactory);
}
......@@ -56,25 +56,25 @@ public class MountingItemProvider extends ItemProviderAdapter implements IEditin
if (itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
addMountingIdPropertyDescriptor(object);
addConstructionIdPropertyDescriptor(object);
addNamePropertyDescriptor(object);
}
return itemPropertyDescriptors;
}
/**
* This adds a property descriptor for the Mounting Id feature.
* This adds a property descriptor for the Construction Id feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected void addMountingIdPropertyDescriptor(Object object) {
protected void addConstructionIdPropertyDescriptor(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,
getResourceLocator(), getString("_UI_Construction_constructionId_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_Construction_constructionId_feature",
"_UI_Construction_type"),
BuildingPhysicsPackage.Literals.CONSTRUCTION__CONSTRUCTION_ID, true, false, false,
ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
......@@ -87,10 +87,10 @@ public class MountingItemProvider extends ItemProviderAdapter implements IEditin
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,
getResourceLocator(), getString("_UI_Construction_name_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_Construction_name_feature",
"_UI_Construction_type"),
BuildingPhysicsPackage.Literals.CONSTRUCTION__NAME, true, false, false,
ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
......@@ -106,7 +106,7 @@ public class MountingItemProvider extends ItemProviderAdapter implements IEditin
public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
if (childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(BuildingPhysicsPackage.Literals.MOUNTING__LAYERS);
childrenFeatures.add(BuildingPhysicsPackage.Literals.CONSTRUCTION__LAYERS);
}
return childrenFeatures;
}
......@@ -142,9 +142,9 @@ public class MountingItemProvider extends ItemProviderAdapter implements IEditin
*/
@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;
String label = ((Construction) object).getName();
return label == null || label.length() == 0 ? getString("_UI_Construction_type")
: getString("_UI_Construction_type") + " " + label;
}
/**
......@@ -158,12 +158,12 @@ public class MountingItemProvider extends ItemProviderAdapter implements IEditin
public void notifyChanged(Notification notification) {
updateChildren(notification);
switch (notification.getFeatureID(Mounting.class)) {
case BuildingPhysicsPackage.MOUNTING__MOUNTING_ID:
case BuildingPhysicsPackage.MOUNTING__NAME:
switch (notification.getFeatureID(Construction.class)) {
case BuildingPhysicsPackage.CONSTRUCTION__CONSTRUCTION_ID:
case BuildingPhysicsPackage.CONSTRUCTION__NAME:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
case BuildingPhysicsPackage.MOUNTING__LAYERS:
case BuildingPhysicsPackage.CONSTRUCTION__LAYERS:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
return;
}
......@@ -181,7 +181,7 @@ public class MountingItemProvider extends ItemProviderAdapter implements IEditin
protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
newChildDescriptors.add(createChildParameter(BuildingPhysicsPackage.Literals.MOUNTING__LAYERS,
newChildDescriptors.add(createChildParameter(BuildingPhysicsPackage.Literals.CONSTRUCTION__LAYERS,
BuildingPhysicsFactory.eINSTANCE.createLayer()));
}
......
......@@ -11,7 +11,9 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
......@@ -103,11 +105,13 @@ public class MaterialCatalogItemProvider extends CatalogItemProvider {
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated NOT
* @generated
*/
@Override
public String getText(Object object) {
return getString("_UI_MaterialCatalog_type");
String label = ((MaterialCatalog) object).getName();
return label == null || label.length() == 0 ? getString("_UI_MaterialCatalog_type")
: getString("_UI_MaterialCatalog_type") + " " + label;
}
/**
......
......@@ -12,6 +12,7 @@ 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;
......
......@@ -10,6 +10,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
......@@ -70,11 +71,13 @@ public class WindowCatalogItemProvider extends CatalogItemProvider {
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated NOT
* @generated
*/
@Override
public String getText(Object object) {
return getString("_UI_WindowCatalog_type");
String label = ((WindowCatalog) object).getName();
return label == null || label.length() == 0 ? getString("_UI_WindowCatalog_type")
: getString("_UI_WindowCatalog_type") + " " + label;
}
/**
......
......@@ -2,7 +2,7 @@
<?eclipse version="3.4"?>
<plugin>
<extension point="org.eclipse.emf.ecp.view.model.provider.xmi.file">
<file filePath="viewmodels/Mounting.view"/>
<file filePath="viewmodels/Construction.view"/>
<file filePath="viewmodels/ConstructionCategory.view"/>
<file filePath="viewmodels/MaterialCatalog.view"/>
<file filePath="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.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="_Hd11YLPZEeup29SeaUMpQQ" name="Mounting">
<rootEClass href="http://www.hftstuttgart.de/buildingphysics#//Mounting"/>
<children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_Hd2ccLPZEeup29SeaUMpQQ" name="Control mountingId">
<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="_Hd11YLPZEeup29SeaUMpQQ" name="Construction">
<rootEClass href="http://www.hftstuttgart.de/buildingphysics#//Construction"/>
<children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_Hd2ccLPZEeup29SeaUMpQQ" name="Control constructionId">
<domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Hd2ccbPZEeup29SeaUMpQQ">
<domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.hftstuttgart.de/buildingphysics#//Mounting/mountingId"/>
<domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.hftstuttgart.de/buildingphysics#//Construction/constructionId"/>
</domainModelReference>
</children>
<children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_Hd2ccrPZEeup29SeaUMpQQ" name="Control name">
<domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Hd2cc7PZEeup29SeaUMpQQ">
<domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.hftstuttgart.de/buildingphysics#//Mounting/name"/>
<domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.hftstuttgart.de/buildingphysics#//Construction/name"/>
</domainModelReference>
</children>
<children xsi:type="org.eclipse.emf.ecp.view.table.model:TableControl" xmi:id="_J63RcLPZEeup29SeaUMpQQ" moveUpDownDisabled="false" detailEditing="WithPanel">
......@@ -26,7 +26,7 @@
<domainModelEReferencePath href="http://www.hftstuttgart.de/buildingphysics#//Material/category"/>
</columnDomainModelReferences>
<domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_MkYRYbPZEeup29SeaUMpQQ">
<domainModelEFeature xsi:type="ecore:EReference" href="http://www.hftstuttgart.de/buildingphysics#//Mounting/layers"/>
<domainModelEFeature xsi:type="ecore:EReference" href="http://www.hftstuttgart.de/buildingphysics#//Construction/layers"/>
</domainModelReference>
</domainModelReference>
<columnConfigurations xsi:type="org.eclipse.emf.ecp.view.table.model:WidthConfiguration" xmi:id="_d7H2QL8HEeuIHZm4y-I19A" columnDomainReference="_QnRfELPZEeup29SeaUMpQQ" weight="30" minWidth="65"/>
......
......@@ -7,18 +7,18 @@
</domainModelReference>
</children>
<children xsi:type="org.eclipse.emf.ecp.view.table.model:TableControl" xmi:id="_vgicgLeuEeu0KumwacCHxQ" detailEditing="WithPanel">
<domainModelReference xsi:type="org.eclipse.emf.ecp.view.table.model:TableDomainModelReference" xmi:id="_yN_hQLeuEeu0KumwacCHxQ">
<columnDomainModelReferences xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_IHsn8L-QEeuIHZm4y-I19A">
<domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.hftstuttgart.de/buildingphysics#//Mounting/mountingId"/>
<domainModelReference xsi:type="org.eclipse.emf.ecp.view.table.model:TableDomainModelReference" xmi:id="_UOehkMBWEeuIHZm4y-I19A">
<columnDomainModelReferences xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_XzxNQMBWEeuIHZm4y-I19A">
<domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.hftstuttgart.de/buildingphysics#//Construction/constructionId"/>
</columnDomainModelReferences>
<columnDomainModelReferences xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_IHsn8b-QEeuIHZm4y-I19A">
<domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.hftstuttgart.de/buildingphysics#//Mounting/name"/>
<columnDomainModelReferences xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_XzxNQcBWEeuIHZm4y-I19A">
<domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.hftstuttgart.de/buildingphysics#//Construction/name"/>
</columnDomainModelReferences>
<domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_yN_hQbeuEeu0KumwacCHxQ">
<domainModelEFeature xsi:type="ecore:EReference" href="http://www.hftstuttgart.de/buildingphysics#//ConstructionCategory/mountings"/>
<domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_UOehkcBWEeuIHZm4y-I19A">
<domainModelEFeature xsi:type="ecore:EReference" href="http://www.hftstuttgart.de/buildingphysics#//ConstructionCategory/constructions"/>
</domainModelReference>
</domainModelReference>
<columnConfigurations xsi:type="org.eclipse.emf.ecp.view.table.model:ReadOnlyColumnConfiguration" xmi:id="_2MtCAL-PEeuIHZm4y-I19A" columnDomainReferences="_IHsn8b-QEeuIHZm4y-I19A _IHsn8L-QEeuIHZm4y-I19A"/>
<columnConfigurations xsi:type="org.eclipse.emf.ecp.view.table.model:ReadOnlyColumnConfiguration" xmi:id="_2MtCAL-PEeuIHZm4y-I19A"/>
</children>
<ecorePaths>/de.hftstuttgart.buildingphysics/model/buildingphysics.ecore</ecorePaths>
</org.eclipse.emf.ecp.view.model:View>
......@@ -91,9 +91,9 @@
</xsl:template>
<xsl:template match="constructionType">
<xsl:element name="mountings">
<xsl:attribute name="mountingId">
<xsl:value-of select="'mounting_'" /><xsl:value-of select="id" />
<xsl:element name="constructions">
<xsl:attribute name="constructionId">
<xsl:value-of select="'construction_'" /><xsl:value-of select="id" />
</xsl:attribute>
<xsl:attribute name="name"><xsl:value-of select="name" /></xsl:attribute>
<xsl:apply-templates select="layer" />
......
......@@ -6,9 +6,10 @@
<semanticResources>platform:/resource/de.hftstuttgart.cityunits.model/model/Quantities.ecore</semanticResources>
<semanticResources>platform:/resource/de.hftstuttgart.cityunits.model/model/Quantities.genmodel</semanticResources>
<semanticResources>http://www.hftstuttgart.de/buildingphysics</semanticResources>
<semanticResources>../catalogs/2020%20German%20Buildings%20IWU.xmi</semanticResources>
<ownedViews xmi:type="viewpoint:DView" uid="_nfHygB3ZEeuNsK3dZmTkbQ">
<viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']"/>
<ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_JKPtIZUqEeudooziRGqkJA" name="Buildingphysics Class Diagram" repPath="#_JKN38JUqEeudooziRGqkJA" changeId="5910fc7c-ffb8-4a2a-9d44-0858cf3e2591">
<ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_JKPtIZUqEeudooziRGqkJA" name="Buildingphysics Class Diagram" repPath="#_JKN38JUqEeudooziRGqkJA" changeId="71726de9-de49-46bf-ba79-c7575f2c14bd">
<description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
<target xmi:type="ecore:EPackage" href="buildingphysics.ecore#/"/>
</ownedRepresentationDescriptors>
......@@ -880,9 +881,9 @@
<actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
</ownedElements>
</ownedDiagramElements>
<ownedDiagramElements xmi:type="diagram:DNodeList" uid="_i_7mkbCmEeup29SeaUMpQQ" name="Mounting" tooltipText="" outgoingEdges="_jAMFQLCmEeup29SeaUMpQQ" incomingEdges="_jAK3JrCmEeup29SeaUMpQQ" width="12" height="10">
<target xmi:type="ecore:EClass" href="buildingphysics.ecore#//Mounting"/>
<semanticElements xmi:type="ecore:EClass" href="buildingphysics.ecore#//Mounting"/>
<ownedDiagramElements xmi:type="diagram:DNodeList" uid="_i_7mkbCmEeup29SeaUMpQQ" name="Construction" tooltipText="" outgoingEdges="_jAMFQLCmEeup29SeaUMpQQ" incomingEdges="_jAK3JrCmEeup29SeaUMpQQ" width="12" height="10">
<target xmi:type="ecore:EClass" href="buildingphysics.ecore#//Construction"/>
<semanticElements xmi:type="ecore:EClass" href="buildingphysics.ecore#//Construction"/>
<arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
<arrangeConstraints>KEEP_SIZE</arrangeConstraints>
<arrangeConstraints>KEEP_RATIO</arrangeConstraints>
......@@ -890,40 +891,35 @@
<description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
</ownedStyle>
<actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
<ownedElements xmi:type="diagram:DNodeListElement" uid="_eYlQYL4tEeuIHZm4y-I19A" name="mountingId : EString" tooltipText="">
<target xmi:type="ecore:EAttribute" href="buildingphysics.ecore#//Mounting/mountingId"/>
<semanticElements xmi:type="ecore:EAttribute" href="buildingphysics.ecore#//Mounting/mountingId"/>
<ownedElements xmi:type="diagram:DNodeListElement" uid="_eYlQYL4tEeuIHZm4y-I19A" name="constructionId : EString" tooltipText="">
<target xmi:type="ecore:EAttribute" href="buildingphysics.ecore#//Construction/constructionId"/>
<semanticElements xmi:type="ecore:EAttribute" href="buildingphysics.ecore#//Construction/constructionId"/>
<ownedStyle xmi:type="diagram:BundledImage" uid="_eYlQYb4tEeuIHZm4y-I19A" labelAlignment="LEFT" description="_J2qHNJUqEeudooziRGqkJA">
<labelFormat>bold</labelFormat>
</ownedStyle>
<actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
</ownedElements>
<ownedElements xmi:type="diagram:DNodeListElement" uid="_jAIa4bCmEeup29SeaUMpQQ" name="name : EString" tooltipText="">
<target xmi:type="ecore:EAttribute" href="buildingphysics.ecore#//Mounting/name"/>
<semanticElements xmi:type="ecore:EAttribute" href="buildingphysics.ecore#//Mounting/name"/>
<target xmi:type="ecore:EAttribute" href="buildingphysics.ecore#//Construction/name"/>
<semanticElements xmi:type="ecore:EAttribute" href="buildingphysics.ecore#//Construction/name"/>
<ownedStyle xmi:type="diagram:BundledImage" uid="_jAIa4rCmEeup29SeaUMpQQ" labelAlignment="LEFT" description="_J2qHNJUqEeudooziRGqkJA">
<labelFormat>bold</labelFormat>
</ownedStyle>
<actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
</ownedElements>
</ownedDiagramElements>
<ownedDiagramElements xmi:type="diagram:DEdge" uid="_jAKQHLCmEeup29SeaUMpQQ" name="[1..*] constructionCategories" sourceNode="_J2mc05UqEeudooziRGqkJA" targetNode="_i_5KU7CmEeup29SeaUMpQQ">
<ownedDiagramElements xmi:type="diagram:DEdge" uid="_jAKQHLCmEeup29SeaUMpQQ" name="[0..*] constructionCategories" sourceNode="_J2mc05UqEeudooziRGqkJA" targetNode="_i_5KU7CmEeup29SeaUMpQQ">
<target xmi:type="ecore:EReference" href="buildingphysics.ecore#//MaterialCatalog/constructionCategories"/>
<semanticElements xmi:type="ecore:EReference" href="buildingphysics.ecore#//MaterialCatalog/constructionCategories"/>
<ownedStyle xmi:type="diagram:EdgeStyle" uid="_jAK3ILCmEeup29SeaUMpQQ" description="_J2uYoZUqEeudooziRGqkJA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
<centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_jAK3IrCmEeup29SeaUMpQQ" showIcon="false">
<customFeatures>labelSize</customFeatures>
<labelFormat>bold</labelFormat>
</centerLabelStyle>
<endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_jAK3IbCmEeup29SeaUMpQQ" showIcon="false" labelColor="39,76,114">
<customFeatures>labelSize</customFeatures>
</endLabelStyle>
<ownedStyle xmi:type="diagram:EdgeStyle" uid="_NLg8jMBTEeuIHZm4y-I19A" description="_J2u_t5UqEeudooziRGqkJA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
<centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_NLg8jsBTEeuIHZm4y-I19A" showIcon="false"/>
<endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_NLg8jcBTEeuIHZm4y-I19A" labelSize="6" showIcon="false" labelColor="39,76,114"/>
</ownedStyle>
<actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
</ownedDiagramElements>
<ownedDiagramElements xmi:type="diagram:DEdge" uid="_jAK3JrCmEeup29SeaUMpQQ" name="[0..*] mountings" sourceNode="_i_5KU7CmEeup29SeaUMpQQ" targetNode="_i_7mkbCmEeup29SeaUMpQQ">
<target xmi:type="ecore:EReference" href="buildingphysics.ecore#//ConstructionCategory/mountings"/>
<semanticElements xmi:type="ecore:EReference" href="buildingphysics.ecore#//ConstructionCategory/mountings"/>
<ownedDiagramElements xmi:type="diagram:DEdge" uid="_jAK3JrCmEeup29SeaUMpQQ" name="[0..*] constructions" sourceNode="_i_5KU7CmEeup29SeaUMpQQ" targetNode="_i_7mkbCmEeup29SeaUMpQQ">
<target xmi:type="ecore:EReference" href="buildingphysics.ecore#//ConstructionCategory/constructions"/>
<semanticElements xmi:type="ecore:EReference" href="buildingphysics.ecore#//ConstructionCategory/constructions"/>
<ownedStyle xmi:type="diagram:EdgeStyle" uid="_jALeMLCmEeup29SeaUMpQQ" description="_J2u_t5UqEeudooziRGqkJA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
<centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_jALeMrCmEeup29SeaUMpQQ" showIcon="false">
<customFeatures>labelSize</customFeatures>
......@@ -949,8 +945,8 @@
<actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
</ownedDiagramElements>
<ownedDiagramElements xmi:type="diagram:DEdge" uid="_jAMFQLCmEeup29SeaUMpQQ" name="[1..*] layers" sourceNode="_i_7mkbCmEeup29SeaUMpQQ" targetNode="_i_5xYrCmEeup29SeaUMpQQ">
<target xmi:type="ecore:EReference" href="buildingphysics.ecore#//Mounting/layers"/>
<semanticElements xmi:type="ecore:EReference" href="buildingphysics.ecore#//Mounting/layers"/>
<target xmi:type="ecore:EReference" href="buildingphysics.ecore#//Construction/layers"/>
<semanticElements xmi:type="ecore:EReference" href="buildingphysics.ecore#//Construction/layers"/>
<ownedStyle xmi:type="diagram:EdgeStyle" uid="_jAMFQbCmEeup29SeaUMpQQ" description="_J2uYoZUqEeudooziRGqkJA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
<centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_jAMFQ7CmEeup29SeaUMpQQ" showIcon="false">
<customFeatures>labelSize</customFeatures>
......
......@@ -102,11 +102,11 @@
</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"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="constructions" upperBound="-1"
eType="#//Construction" containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Mounting">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="mountingId" lowerBound="1"
<eClassifiers xsi:type="ecore:EClass" name="Construction">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="constructionId" 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:EReference" name="layers" lowerBound="1"
......
......@@ -63,12 +63,12 @@
</genClasses>
<genClasses ecoreClass="buildingphysics.ecore#//ConstructionCategory">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//ConstructionCategory/name"/>
<genFeatures property="None" createChild="false" ecoreFeature="ecore:EReference buildingphysics.ecore#//ConstructionCategory/mountings"/>
<genFeatures property="None" createChild="false" ecoreFeature="ecore:EReference buildingphysics.ecore#//ConstructionCategory/constructions"/>
</genClasses>
<genClasses image="false" 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 image="false" ecoreClass="buildingphysics.ecore#//Construction">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Construction/constructionId"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Construction/name"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference buildingphysics.ecore#//Construction/layers"/>
</genClasses>
<genClasses image="false" ecoreClass="buildingphysics.ecore#//Layer">
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference buildingphysics.ecore#//Layer/material"
......
......@@ -85,13 +85,13 @@ public interface BuildingPhysicsFactory extends EFactory {
ConstructionCategory createConstructionCategory();
/**
* Returns a new object of class '<em>Mounting</em>'.
* Returns a new object of class '<em>Construction</em>'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return a new object of class '<em>Mounting</em>'.
* @return a new object of class '<em>Construction</em>'.
* @generated
*/
Mounting createMounting();
Construction createConstruction();
/**
* Returns a new object of class '<em>Layer</em>'.
......
......@@ -641,13 +641,13 @@ public interface BuildingPhysicsPackage extends EPackage {
int CONSTRUCTION_CATEGORY__NAME = 0;
/**
* The feature id for the '<em><b>Mountings</b></em>' containment reference list.
* The feature id for the '<em><b>Constructions</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
int CONSTRUCTION_CATEGORY__MOUNTINGS = 1;
int CONSTRUCTION_CATEGORY__CONSTRUCTIONS = 1;
/**
* The number of structural features of the '<em>Construction Category</em>' class.
......@@ -668,23 +668,23 @@ public interface BuildingPhysicsPackage extends EPackage {
int CONSTRUCTION_CATEGORY_OPERATION_COUNT = 0;
/**
* The meta object id for the '{@link de.hftstuttgart.buildingphysics.impl.MountingImpl <em>Mounting</em>}' class.
* The meta object id for the '{@link de.hftstuttgart.buildingphysics.impl.ConstructionImpl <em>Construction</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see de.hftstuttgart.buildingphysics.impl.MountingImpl
* @see de.hftstuttgart.buildingphysics.impl.BuildingPhysicsPackageImpl#getMounting()
* @see de.hftstuttgart.buildingphysics.impl.ConstructionImpl
* @see de.hftstuttgart.buildingphysics.impl.BuildingPhysicsPackageImpl#getConstruction()
* @generated
*/
int MOUNTING = 8;
int CONSTRUCTION = 8;
/**
* The feature id for the '<em><b>Mounting Id</b></em>' attribute.
* The feature id for the '<em><b>Construction Id</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
int MOUNTING__MOUNTING_ID = 0;
int CONSTRUCTION__CONSTRUCTION_ID = 0;