...@@ -4,22 +4,22 @@ ...@@ -4,22 +4,22 @@
<xsl:template match="/buildingPhysicsLibrary"> <xsl:template match="/buildingPhysicsLibrary">
<buildphys:BuildingPhysicsCatalog xmi:version="2.0" <buildphys:BuildingPhysicsCatalog xmi:version="2.0"
xmlns:xmi="http://www.omg.org/XMI" xmlns:buildphys="http://www.hftstuttgart.de/buildingphysics" xmlns:xmi="http://www.omg.org/XMI" xmlns:buildphys="http://www.hftstuttgart.de/buildingphysics">
author="Verena Weiler, HfT Stuttgart"> <xsl:attribute name="name"><xsl:value-of select="name" /></xsl:attribute>
<xsl:attribute name="description"><xsl:value-of select="description" /></xsl:attribute>
<xsl:attribute name="source"><xsl:value-of select="source" /></xsl:attribute>
<xsl:apply-templates select="windowLib" /> <xsl:apply-templates select="windowLib" />
<xsl:apply-templates select="constructionLib" /> <xsl:apply-templates select="constructionLib/materialCategory" />
<xsl:apply-templates select="constructionLib/constructionCategory" />
</buildphys:BuildingPhysicsCatalog> </buildphys:BuildingPhysicsCatalog>
</xsl:template> </xsl:template>
<xsl:template match="windowLib"> <xsl:template match="windowLib">
<xsl:element name="windowCatalog"> <xsl:element name="windows">
<xsl:attribute name="name"><xsl:value-of select="name" /></xsl:attribute>
<xsl:attribute name="description"><xsl:value-of select="description" /></xsl:attribute>
<xsl:attribute name="source"><xsl:value-of select="source" /></xsl:attribute>
<xsl:for-each select="windowType"> <xsl:for-each select="windowType">
<xsl:element name="windowTypes"> <xsl:element name="windowTypes">
<xsl:attribute name="windowTypeId"> <xsl:attribute name="windowTypeId">
<xsl:value-of select="'window_'" /><xsl:value-of select="id" /></xsl:attribute> <xsl:value-of select="'window_'" /><xsl:value-of select="id" /></xsl:attribute>
<xsl:attribute name="name"><xsl:value-of select="name" /></xsl:attribute> <xsl:attribute name="name"><xsl:value-of select="name" /></xsl:attribute>
<xsl:attribute name="uValue"><xsl:value-of select="uValue" /> <xsl:attribute name="uValue"><xsl:value-of select="uValue" />
<xsl:value-of select="' W/(m²·K)'" /></xsl:attribute> <xsl:value-of select="' W/(m²·K)'" /></xsl:attribute>
...@@ -41,17 +41,7 @@ ...@@ -41,17 +41,7 @@
</xsl:element> </xsl:element>
</xsl:template> </xsl:template>
<xsl:template match="constructionLib"> <xsl:template match="constructionLib/materialCategory">
<xsl:element name="materialCatalog">
<xsl:attribute name="name"><xsl:value-of select="name" /></xsl:attribute>
<xsl:attribute name="description"><xsl:value-of select="description" /></xsl:attribute>
<xsl:attribute name="source"><xsl:value-of select="source" /></xsl:attribute>
<xsl:apply-templates select="materialCategory" />
<xsl:apply-templates select="constructionCategory" />
</xsl:element>
</xsl:template>
<xsl:template match="materialCategory">
<xsl:element name="materialCategories"> <xsl:element name="materialCategories">
<xsl:attribute name="name"><xsl:value-of select="name" /></xsl:attribute> <xsl:attribute name="name"><xsl:value-of select="name" /></xsl:attribute>
<xsl:apply-templates select="material" /> <xsl:apply-templates select="material" />
...@@ -83,7 +73,7 @@ ...@@ -83,7 +73,7 @@
</xsl:element> </xsl:element>
</xsl:template> </xsl:template>
<xsl:template match="constructionCategory"> <xsl:template match="constructionLib/constructionCategory">
<xsl:element name="constructionCategories"> <xsl:element name="constructionCategories">
<xsl:attribute name="name"><xsl:value-of select="name" /></xsl:attribute> <xsl:attribute name="name"><xsl:value-of select="name" /></xsl:attribute>
<xsl:apply-templates select="constructionType" /> <xsl:apply-templates select="constructionType" />
...@@ -91,9 +81,9 @@ ...@@ -91,9 +81,9 @@
</xsl:template> </xsl:template>
<xsl:template match="constructionType"> <xsl:template match="constructionType">
<xsl:element name="mountings"> <xsl:element name="constructions">
<xsl:attribute name="mountingId"> <xsl:attribute name="constructionId">
<xsl:value-of select="'mounting_'" /><xsl:value-of select="id" /> <xsl:value-of select="'construction_'" /><xsl:value-of select="id" />
</xsl:attribute> </xsl:attribute>
<xsl:attribute name="name"><xsl:value-of select="name" /></xsl:attribute> <xsl:attribute name="name"><xsl:value-of select="name" /></xsl:attribute>
<xsl:apply-templates select="layer" /> <xsl:apply-templates select="layer" />
......
...@@ -3,12 +3,15 @@ ...@@ -3,12 +3,15 @@
xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="buildingphysics" nsURI="http://www.hftstuttgart.de/buildingphysics" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="buildingphysics" nsURI="http://www.hftstuttgart.de/buildingphysics"
nsPrefix="buildphys"> nsPrefix="buildphys">
<eClassifiers xsi:type="ecore:EClass" name="BuildingPhysicsCatalog"> <eClassifiers xsi:type="ecore:EClass" name="BuildingPhysicsCatalog">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="author" lowerBound="1" <eStructuralFeatures xsi:type="ecore:EReference" name="windows" lowerBound="1"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> eType="#//WindowCategory" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="windowCatalog" lowerBound="1" <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
eType="#//WindowCatalog" containment="true"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="materialCatalog" lowerBound="1" <eStructuralFeatures xsi:type="ecore:EAttribute" name="source" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
eType="#//MaterialCatalog" containment="true"/> <eStructuralFeatures xsi:type="ecore:EReference" name="materialCategories" upperBound="-1"
eType="#//MaterialCategory" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="constructionCategories"
upperBound="-1" eType="#//ConstructionCategory" containment="true"/>
</eClassifiers> </eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="WindowType"> <eClassifiers xsi:type="ecore:EClass" name="WindowType">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="windowTypeId" lowerBound="1" <eStructuralFeatures xsi:type="ecore:EAttribute" name="windowTypeId" lowerBound="1"
...@@ -48,21 +51,10 @@ ...@@ -48,21 +51,10 @@
<eStructuralFeatures xsi:type="ecore:EAttribute" name="disposalDescription" lowerBound="1" <eStructuralFeatures xsi:type="ecore:EAttribute" name="disposalDescription" lowerBound="1"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eClassifiers> </eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Catalog" abstract="true"> <eClassifiers xsi:type="ecore:EClass" name="WindowCategory">
<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="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="source" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="WindowCatalog" eSuperTypes="#//Catalog">
<eStructuralFeatures xsi:type="ecore:EReference" name="windowTypes" upperBound="-1" <eStructuralFeatures xsi:type="ecore:EReference" name="windowTypes" upperBound="-1"
eType="#//WindowType" containment="true"/> eType="#//WindowType" containment="true"/>
</eClassifiers> </eClassifiers>
<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"> <eClassifiers xsi:type="ecore:EClass" name="MaterialCategory">
<eStructuralFeatures xsi:type="ecore:EReference" name="materials" upperBound="-1" <eStructuralFeatures xsi:type="ecore:EReference" name="materials" upperBound="-1"
eType="#//Material" containment="true" eOpposite="#//Material/category"/> eType="#//Material" containment="true" eOpposite="#//Material/category"/>
...@@ -102,11 +94,11 @@ ...@@ -102,11 +94,11 @@
</eClassifiers> </eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="ConstructionCategory"> <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: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" <eStructuralFeatures xsi:type="ecore:EReference" name="constructions" upperBound="-1"
eType="#//Mounting" containment="true"/> eType="#//Construction" containment="true"/>
</eClassifiers> </eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Mounting"> <eClassifiers xsi:type="ecore:EClass" name="Construction">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="mountingId" lowerBound="1" <eStructuralFeatures xsi:type="ecore:EAttribute" name="constructionId" lowerBound="1"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" iD="true"/> 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="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="layers" lowerBound="1" <eStructuralFeatures xsi:type="ecore:EReference" name="layers" lowerBound="1"
......
...@@ -12,9 +12,12 @@ ...@@ -12,9 +12,12 @@
<genPackages prefix="BuildingPhysics" basePackage="de.hftstuttgart" disposableProviderFactory="true" <genPackages prefix="BuildingPhysics" basePackage="de.hftstuttgart" disposableProviderFactory="true"
fileExtensions="buildphys" ecorePackage="buildingphysics.ecore#/"> fileExtensions="buildphys" ecorePackage="buildingphysics.ecore#/">
<genClasses ecoreClass="buildingphysics.ecore#//BuildingPhysicsCatalog"> <genClasses ecoreClass="buildingphysics.ecore#//BuildingPhysicsCatalog">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//BuildingPhysicsCatalog/author"/> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference buildingphysics.ecore#//BuildingPhysicsCatalog/windows"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference buildingphysics.ecore#//BuildingPhysicsCatalog/windowCatalog"/> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//BuildingPhysicsCatalog/name"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference buildingphysics.ecore#//BuildingPhysicsCatalog/materialCatalog"/> <genFeatures createChild="false" propertyMultiLine="true" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//BuildingPhysicsCatalog/description"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//BuildingPhysicsCatalog/source"/>
<genFeatures children="true" createChild="true" propertySortChoices="true" ecoreFeature="ecore:EReference buildingphysics.ecore#//BuildingPhysicsCatalog/materialCategories"/>
<genFeatures children="true" createChild="true" propertySortChoices="true" ecoreFeature="ecore:EReference buildingphysics.ecore#//BuildingPhysicsCatalog/constructionCategories"/>
</genClasses> </genClasses>
<genClasses image="false" ecoreClass="buildingphysics.ecore#//WindowType"> <genClasses image="false" ecoreClass="buildingphysics.ecore#//WindowType">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//WindowType/windowTypeId"/> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//WindowType/windowTypeId"/>
...@@ -30,25 +33,17 @@ ...@@ -30,25 +33,17 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//WindowType/disposalCarbon"/> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//WindowType/disposalCarbon"/>
<genFeatures createChild="false" propertyMultiLine="true" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//WindowType/disposalDescription"/> <genFeatures createChild="false" propertyMultiLine="true" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//WindowType/disposalDescription"/>
</genClasses> </genClasses>
<genClasses image="false" ecoreClass="buildingphysics.ecore#//Catalog"> <genClasses ecoreClass="buildingphysics.ecore#//WindowCategory">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Catalog/name"/> <genFeatures property="None" createChild="false" ecoreFeature="ecore:EReference buildingphysics.ecore#//WindowCategory/windowTypes"/>
<genFeatures createChild="false" propertyMultiLine="true" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Catalog/description"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Catalog/source"/>
</genClasses>
<genClasses ecoreClass="buildingphysics.ecore#//WindowCatalog">
<genFeatures property="None" children="true" createChild="false" ecoreFeature="ecore:EReference buildingphysics.ecore#//WindowCatalog/windowTypes"/>
</genClasses>
<genClasses ecoreClass="buildingphysics.ecore#//MaterialCatalog">
<genFeatures property="None" children="true" createChild="false" ecoreFeature="ecore:EReference buildingphysics.ecore#//MaterialCatalog/materialCategories"/>
<genFeatures property="None" children="true" createChild="false" ecoreFeature="ecore:EReference buildingphysics.ecore#//MaterialCatalog/constructionCategories"/>
</genClasses> </genClasses>
<genClasses ecoreClass="buildingphysics.ecore#//MaterialCategory"> <genClasses ecoreClass="buildingphysics.ecore#//MaterialCategory">
<genFeatures property="None" createChild="false" ecoreFeature="ecore:EReference buildingphysics.ecore#//MaterialCategory/materials"/> <genFeatures property="None" createChild="false" ecoreFeature="ecore:EReference buildingphysics.ecore#//MaterialCategory/materials"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//MaterialCategory/name"/> <genFeatures createChild="false" propertyDescription="Name of material category"
ecoreFeature="ecore:EAttribute buildingphysics.ecore#//MaterialCategory/name"/>
</genClasses> </genClasses>
<genClasses image="false" ecoreClass="buildingphysics.ecore#//Material"> <genClasses image="false" ecoreClass="buildingphysics.ecore#//Material">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Material/materialId"/> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Material/materialId"/>
<genFeatures createChild="false" propertyDescription="Bla Blub" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Material/name"/> <genFeatures createChild="false" propertyDescription="Name of material" 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/density"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Material/heatCapacity"/> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Material/heatCapacity"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Material/conductivity"/> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Material/conductivity"/>
...@@ -62,12 +57,12 @@ ...@@ -62,12 +57,12 @@
</genClasses> </genClasses>
<genClasses ecoreClass="buildingphysics.ecore#//ConstructionCategory"> <genClasses ecoreClass="buildingphysics.ecore#//ConstructionCategory">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//ConstructionCategory/name"/> <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>
<genClasses image="false" ecoreClass="buildingphysics.ecore#//Mounting"> <genClasses image="false" ecoreClass="buildingphysics.ecore#//Construction">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Mounting/mountingId"/> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Construction/constructionId"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Mounting/name"/> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Construction/name"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference buildingphysics.ecore#//Mounting/layers"/> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference buildingphysics.ecore#//Construction/layers"/>
</genClasses> </genClasses>
<genClasses image="false" ecoreClass="buildingphysics.ecore#//Layer"> <genClasses image="false" ecoreClass="buildingphysics.ecore#//Layer">
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference buildingphysics.ecore#//Layer/material" <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference buildingphysics.ecore#//Layer/material"
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
*/ */
package de.hftstuttgart.buildingphysics; package de.hftstuttgart.buildingphysics;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EObject;
/** /**
...@@ -13,9 +14,12 @@ import org.eclipse.emf.ecore.EObject; ...@@ -13,9 +14,12 @@ import org.eclipse.emf.ecore.EObject;
* The following features are supported: * The following features are supported:
* </p> * </p>
* <ul> * <ul>
* <li>{@link de.hftstuttgart.buildingphysics.BuildingPhysicsCatalog#getAuthor <em>Author</em>}</li> * <li>{@link de.hftstuttgart.buildingphysics.BuildingPhysicsCatalog#getWindows <em>Windows</em>}</li>
* <li>{@link de.hftstuttgart.buildingphysics.BuildingPhysicsCatalog#getWindowCatalog <em>Window Catalog</em>}</li> * <li>{@link de.hftstuttgart.buildingphysics.BuildingPhysicsCatalog#getName <em>Name</em>}</li>
* <li>{@link de.hftstuttgart.buildingphysics.BuildingPhysicsCatalog#getMaterialCatalog <em>Material Catalog</em>}</li> * <li>{@link de.hftstuttgart.buildingphysics.BuildingPhysicsCatalog#getDescription <em>Description</em>}</li>
* <li>{@link de.hftstuttgart.buildingphysics.BuildingPhysicsCatalog#getSource <em>Source</em>}</li>
* <li>{@link de.hftstuttgart.buildingphysics.BuildingPhysicsCatalog#getMaterialCategories <em>Material Categories</em>}</li>
* <li>{@link de.hftstuttgart.buildingphysics.BuildingPhysicsCatalog#getConstructionCategories <em>Construction Categories</em>}</li>
* </ul> * </ul>
* *
* @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getBuildingPhysicsCatalog() * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getBuildingPhysicsCatalog()
...@@ -24,69 +28,115 @@ import org.eclipse.emf.ecore.EObject; ...@@ -24,69 +28,115 @@ import org.eclipse.emf.ecore.EObject;
*/ */
public interface BuildingPhysicsCatalog extends EObject { public interface BuildingPhysicsCatalog extends EObject {
/** /**
* Returns the value of the '<em><b>Author</b></em>' attribute. * Returns the value of the '<em><b>Windows</b></em>' containment reference.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @return the value of the '<em>Author</em>' attribute. * @return the value of the '<em>Windows</em>' containment reference.
* @see #setAuthor(String) * @see #setWindows(WindowCategory)
* @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getBuildingPhysicsCatalog_Author() * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getBuildingPhysicsCatalog_Windows()
* @model containment="true" required="true"
* @generated
*/
WindowCategory getWindows();
/**
* Sets the value of the '{@link de.hftstuttgart.buildingphysics.BuildingPhysicsCatalog#getWindows <em>Windows</em>}' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Windows</em>' containment reference.
* @see #getWindows()
* @generated
*/
void setWindows(WindowCategory value);
/**
* Returns the value of the '<em><b>Name</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the value of the '<em>Name</em>' attribute.
* @see #setName(String)
* @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getBuildingPhysicsCatalog_Name()
* @model required="true" * @model required="true"
* @generated * @generated
*/ */
String getAuthor(); String getName();
/** /**
* Sets the value of the '{@link de.hftstuttgart.buildingphysics.BuildingPhysicsCatalog#getAuthor <em>Author</em>}' attribute. * Sets the value of the '{@link de.hftstuttgart.buildingphysics.BuildingPhysicsCatalog#getName <em>Name</em>}' attribute.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @param value the new value of the '<em>Author</em>' attribute. * @param value the new value of the '<em>Name</em>' attribute.
* @see #getAuthor() * @see #getName()
* @generated * @generated
*/ */
void setAuthor(String value); void setName(String value);
/** /**
* Returns the value of the '<em><b>Window Catalog</b></em>' containment reference. * Returns the value of the '<em><b>Description</b></em>' attribute.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @return the value of the '<em>Window Catalog</em>' containment reference. * @return the value of the '<em>Description</em>' attribute.
* @see #setWindowCatalog(WindowCatalog) * @see #setDescription(String)
* @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getBuildingPhysicsCatalog_WindowCatalog() * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getBuildingPhysicsCatalog_Description()
* @model containment="true" required="true" * @model
* @generated * @generated
*/ */
WindowCatalog getWindowCatalog(); String getDescription();
/** /**
* Sets the value of the '{@link de.hftstuttgart.buildingphysics.BuildingPhysicsCatalog#getWindowCatalog <em>Window Catalog</em>}' containment reference. * Sets the value of the '{@link de.hftstuttgart.buildingphysics.BuildingPhysicsCatalog#getDescription <em>Description</em>}' attribute.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @param value the new value of the '<em>Window Catalog</em>' containment reference. * @param value the new value of the '<em>Description</em>' attribute.
* @see #getWindowCatalog() * @see #getDescription()
* @generated * @generated
*/ */
void setWindowCatalog(WindowCatalog value); void setDescription(String value);
/** /**
* Returns the value of the '<em><b>Material Catalog</b></em>' containment reference. * Returns the value of the '<em><b>Source</b></em>' attribute.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @return the value of the '<em>Material Catalog</em>' containment reference. * @return the value of the '<em>Source</em>' attribute.
* @see #setMaterialCatalog(MaterialCatalog) * @see #setSource(String)
* @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getBuildingPhysicsCatalog_MaterialCatalog() * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getBuildingPhysicsCatalog_Source()
* @model containment="true" required="true" * @model
* @generated
*/
String getSource();
/**
* Sets the value of the '{@link de.hftstuttgart.buildingphysics.BuildingPhysicsCatalog#getSource <em>Source</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Source</em>' attribute.
* @see #getSource()
* @generated
*/
void setSource(String value);
/**
* Returns the value of the '<em><b>Construction Categories</b></em>' containment reference list.
* The list contents are of type {@link de.hftstuttgart.buildingphysics.ConstructionCategory}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the value of the '<em>Construction Categories</em>' containment reference list.
* @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getBuildingPhysicsCatalog_ConstructionCategories()
* @model containment="true"
* @generated * @generated
*/ */
MaterialCatalog getMaterialCatalog(); EList<ConstructionCategory> getConstructionCategories();
/** /**
* Sets the value of the '{@link de.hftstuttgart.buildingphysics.BuildingPhysicsCatalog#getMaterialCatalog <em>Material Catalog</em>}' containment reference. * Returns the value of the '<em><b>Material Categories</b></em>' containment reference list.
* The list contents are of type {@link de.hftstuttgart.buildingphysics.MaterialCategory}.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @param value the new value of the '<em>Material Catalog</em>' containment reference. * @return the value of the '<em>Material Categories</em>' containment reference list.
* @see #getMaterialCatalog() * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getBuildingPhysicsCatalog_MaterialCategories()
* @model containment="true"
* @generated * @generated
*/ */
void setMaterialCatalog(MaterialCatalog value); EList<MaterialCategory> getMaterialCategories();
} // BuildingPhysicsCatalog } // BuildingPhysicsCatalog
...@@ -40,22 +40,13 @@ public interface BuildingPhysicsFactory extends EFactory { ...@@ -40,22 +40,13 @@ public interface BuildingPhysicsFactory extends EFactory {
WindowType createWindowType(); WindowType createWindowType();
/** /**
* Returns a new object of class '<em>Window Catalog</em>'. * Returns a new object of class '<em>Window Category</em>'.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @return a new object of class '<em>Window Catalog</em>'. * @return a new object of class '<em>Window Category</em>'.
* @generated * @generated
*/ */
WindowCatalog createWindowCatalog(); WindowCategory createWindowCategory();
/**
* Returns a new object of class '<em>Material Catalog</em>'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return a new object of class '<em>Material Catalog</em>'.
* @generated
*/
MaterialCatalog createMaterialCatalog();
/** /**
* Returns a new object of class '<em>Material Category</em>'. * Returns a new object of class '<em>Material Category</em>'.
...@@ -85,13 +76,13 @@ public interface BuildingPhysicsFactory extends EFactory { ...@@ -85,13 +76,13 @@ public interface BuildingPhysicsFactory extends EFactory {
ConstructionCategory createConstructionCategory(); ConstructionCategory createConstructionCategory();
/** /**
* Returns a new object of class '<em>Mounting</em>'. * Returns a new object of class '<em>Construction</em>'.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @return a new object of class '<em>Mounting</em>'. * @return a new object of class '<em>Construction</em>'.
* @generated * @generated
*/ */
Mounting createMounting(); Construction createConstruction();
/** /**
* Returns a new object of class '<em>Layer</em>'. * Returns a new object of class '<em>Layer</em>'.
......
/**
*/
package de.hftstuttgart.buildingphysics;
import org.eclipse.emf.ecore.EObject;
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Catalog</b></em>'.
* <!-- end-user-doc -->
*
* <p>
* The following features are supported:
* </p>
* <ul>
* <li>{@link de.hftstuttgart.buildingphysics.Catalog#getName <em>Name</em>}</li>
* <li>{@link de.hftstuttgart.buildingphysics.Catalog#getDescription <em>Description</em>}</li>
* <li>{@link de.hftstuttgart.buildingphysics.Catalog#getSource <em>Source</em>}</li>
* </ul>
*
* @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getCatalog()
* @model abstract="true"
* @generated
*/
public interface Catalog extends EObject {
/**
* Returns the value of the '<em><b>Name</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the value of the '<em>Name</em>' attribute.
* @see #setName(String)
* @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getCatalog_Name()
* @model required="true"
* @generated
*/
String getName();
/**
* Sets the value of the '{@link de.hftstuttgart.buildingphysics.Catalog#getName <em>Name</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Name</em>' attribute.
* @see #getName()
* @generated
*/
void setName(String value);
/**
* Returns the value of the '<em><b>Description</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the value of the '<em>Description</em>' attribute.
* @see #setDescription(String)
* @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getCatalog_Description()
* @model
* @generated
*/
String getDescription();
/**
* Sets the value of the '{@link de.hftstuttgart.buildingphysics.Catalog#getDescription <em>Description</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Description</em>' attribute.
* @see #getDescription()
* @generated
*/
void setDescription(String value);
/**
* Returns the value of the '<em><b>Source</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the value of the '<em>Source</em>' attribute.
* @see #setSource(String)
* @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getCatalog_Source()
* @model
* @generated
*/
String getSource();
/**
* Sets the value of the '{@link de.hftstuttgart.buildingphysics.Catalog#getSource <em>Source</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Source</em>' attribute.
* @see #getSource()
* @generated
*/
void setSource(String value);
} // Catalog
...@@ -8,44 +8,44 @@ import org.eclipse.emf.ecore.EObject; ...@@ -8,44 +8,44 @@ import org.eclipse.emf.ecore.EObject;
/** /**
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* A representation of the model object '<em><b>Mounting</b></em>'. * A representation of the model object '<em><b>Construction</b></em>'.
* <!-- end-user-doc --> * <!-- end-user-doc -->
* *
* <p> * <p>
* The following features are supported: * The following features are supported:
* </p> * </p>
* <ul> * <ul>
* <li>{@link de.hftstuttgart.buildingphysics.Mounting#getMountingId <em>Mounting Id</em>}</li> * <li>{@link de.hftstuttgart.buildingphysics.Construction#getConstructionId <em>Construction Id</em>}</li>
* <li>{@link de.hftstuttgart.buildingphysics.Mounting#getName <em>Name</em>}</li> * <li>{@link de.hftstuttgart.buildingphysics.Construction#getName <em>Name</em>}</li>
* <li>{@link de.hftstuttgart.buildingphysics.Mounting#getLayers <em>Layers</em>}</li> * <li>{@link de.hftstuttgart.buildingphysics.Construction#getLayers <em>Layers</em>}</li>
* </ul> * </ul>
* *
* @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getMounting() * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getConstruction()
* @model * @model
* @generated * @generated
*/ */
public interface Mounting extends EObject { public interface Construction extends EObject {
/** /**
* Returns the value of the '<em><b>Mounting Id</b></em>' attribute. * Returns the value of the '<em><b>Construction Id</b></em>' attribute.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @return the value of the '<em>Mounting Id</em>' attribute. * @return the value of the '<em>Construction Id</em>' attribute.
* @see #setMountingId(String) * @see #setConstructionId(String)
* @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getMounting_MountingId() * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getConstruction_ConstructionId()
* @model id="true" required="true" * @model id="true" required="true"
* @generated * @generated
*/ */
String getMountingId(); String getConstructionId();
/** /**
* Sets the value of the '{@link de.hftstuttgart.buildingphysics.Mounting#getMountingId <em>Mounting Id</em>}' attribute. * Sets the value of the '{@link de.hftstuttgart.buildingphysics.Construction#getConstructionId <em>Construction Id</em>}' attribute.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @param value the new value of the '<em>Mounting Id</em>' attribute. * @param value the new value of the '<em>Construction Id</em>' attribute.
* @see #getMountingId() * @see #getConstructionId()
* @generated * @generated
*/ */
void setMountingId(String value); void setConstructionId(String value);
/** /**
* Returns the value of the '<em><b>Name</b></em>' attribute. * Returns the value of the '<em><b>Name</b></em>' attribute.
...@@ -53,14 +53,14 @@ public interface Mounting extends EObject { ...@@ -53,14 +53,14 @@ public interface Mounting extends EObject {
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @return the value of the '<em>Name</em>' attribute. * @return the value of the '<em>Name</em>' attribute.
* @see #setName(String) * @see #setName(String)
* @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getMounting_Name() * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getConstruction_Name()
* @model required="true" * @model required="true"
* @generated * @generated
*/ */
String getName(); String getName();
/** /**
* Sets the value of the '{@link de.hftstuttgart.buildingphysics.Mounting#getName <em>Name</em>}' attribute. * Sets the value of the '{@link de.hftstuttgart.buildingphysics.Construction#getName <em>Name</em>}' attribute.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @param value the new value of the '<em>Name</em>' attribute. * @param value the new value of the '<em>Name</em>' attribute.
...@@ -75,10 +75,10 @@ public interface Mounting extends EObject { ...@@ -75,10 +75,10 @@ public interface Mounting extends EObject {
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @return the value of the '<em>Layers</em>' containment reference list. * @return the value of the '<em>Layers</em>' containment reference list.
* @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getMounting_Layers() * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getConstruction_Layers()
* @model containment="true" required="true" * @model containment="true" required="true"
* @generated * @generated
*/ */
EList<Layer> getLayers(); EList<Layer> getLayers();
} // Mounting } // Construction
...@@ -16,7 +16,7 @@ import org.eclipse.emf.ecore.EObject; ...@@ -16,7 +16,7 @@ import org.eclipse.emf.ecore.EObject;
* </p> * </p>
* <ul> * <ul>
* <li>{@link de.hftstuttgart.buildingphysics.ConstructionCategory#getName <em>Name</em>}</li> * <li>{@link de.hftstuttgart.buildingphysics.ConstructionCategory#getName <em>Name</em>}</li>
* <li>{@link de.hftstuttgart.buildingphysics.ConstructionCategory#getMountings <em>Mountings</em>}</li> * <li>{@link de.hftstuttgart.buildingphysics.ConstructionCategory#getConstructions <em>Constructions</em>}</li>
* </ul> * </ul>
* *
* @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getConstructionCategory() * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getConstructionCategory()
...@@ -47,15 +47,15 @@ public interface ConstructionCategory extends EObject { ...@@ -47,15 +47,15 @@ public interface ConstructionCategory extends EObject {
void setName(String value); void setName(String value);
/** /**
* Returns the value of the '<em><b>Mountings</b></em>' containment reference list. * Returns the value of the '<em><b>Constructions</b></em>' containment reference list.
* The list contents are of type {@link de.hftstuttgart.buildingphysics.Mounting}. * The list contents are of type {@link de.hftstuttgart.buildingphysics.Construction}.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @return the value of the '<em>Mountings</em>' containment reference list. * @return the value of the '<em>Constructions</em>' containment reference list.
* @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getConstructionCategory_Mountings() * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getConstructionCategory_Constructions()
* @model containment="true" * @model containment="true"
* @generated * @generated
*/ */
EList<Mounting> getMountings(); EList<Construction> getConstructions();
} // ConstructionCategory } // ConstructionCategory
/**
*/
package de.hftstuttgart.buildingphysics;
import org.eclipse.emf.common.util.EList;
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Material Catalog</b></em>'.
* <!-- end-user-doc -->
*
* <p>
* The following features are supported:
* </p>
* <ul>
* <li>{@link de.hftstuttgart.buildingphysics.MaterialCatalog#getMaterialCategories <em>Material Categories</em>}</li>
* <li>{@link de.hftstuttgart.buildingphysics.MaterialCatalog#getConstructionCategories <em>Construction Categories</em>}</li>
* </ul>
*
* @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getMaterialCatalog()
* @model
* @generated
*/
public interface MaterialCatalog extends Catalog {
/**
* Returns the value of the '<em><b>Material Categories</b></em>' containment reference list.
* The list contents are of type {@link de.hftstuttgart.buildingphysics.MaterialCategory}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the value of the '<em>Material Categories</em>' containment reference list.
* @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getMaterialCatalog_MaterialCategories()
* @model containment="true"
* @generated
*/
EList<MaterialCategory> getMaterialCategories();
/**
* Returns the value of the '<em><b>Construction Categories</b></em>' containment reference list.
* The list contents are of type {@link de.hftstuttgart.buildingphysics.ConstructionCategory}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the value of the '<em>Construction Categories</em>' containment reference list.
* @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getMaterialCatalog_ConstructionCategories()
* @model containment="true" required="true"
* @generated
*/
EList<ConstructionCategory> getConstructionCategories();
} // MaterialCatalog
...@@ -4,33 +4,35 @@ package de.hftstuttgart.buildingphysics; ...@@ -4,33 +4,35 @@ package de.hftstuttgart.buildingphysics;
import org.eclipse.emf.common.util.EList; import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EObject;
/** /**
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* A representation of the model object '<em><b>Window Catalog</b></em>'. * A representation of the model object '<em><b>Window Category</b></em>'.
* <!-- end-user-doc --> * <!-- end-user-doc -->
* *
* <p> * <p>
* The following features are supported: * The following features are supported:
* </p> * </p>
* <ul> * <ul>
* <li>{@link de.hftstuttgart.buildingphysics.WindowCatalog#getWindowTypes <em>Window Types</em>}</li> * <li>{@link de.hftstuttgart.buildingphysics.WindowCategory#getWindowTypes <em>Window Types</em>}</li>
* </ul> * </ul>
* *
* @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getWindowCatalog() * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getWindowCategory()
* @model * @model
* @generated * @generated
*/ */
public interface WindowCatalog extends Catalog { public interface WindowCategory extends EObject {
/** /**
* Returns the value of the '<em><b>Window Types</b></em>' containment reference list. * Returns the value of the '<em><b>Window Types</b></em>' containment reference list.
* The list contents are of type {@link de.hftstuttgart.buildingphysics.WindowType}. * The list contents are of type {@link de.hftstuttgart.buildingphysics.WindowType}.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @return the value of the '<em>Window Types</em>' containment reference list. * @return the value of the '<em>Window Types</em>' containment reference list.
* @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getWindowCatalog_WindowTypes() * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getWindowCategory_WindowTypes()
* @model containment="true" * @model containment="true"
* @generated * @generated
*/ */
EList<WindowType> getWindowTypes(); EList<WindowType> getWindowTypes();
} // WindowCatalog } // WindowCategory