Skip to content
GitLab
Commit 7d014334 authored by Kai-Holger Brassel's avatar Kai-Holger Brassel
Browse files

Rename Mounting to Construction

parent f80d5e31
master
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1457 additions and 1452 deletions
+1457 -1452
de.hftstuttgart.buildingphysics.edit/plugin.properties
+ 5
- 6
View file @ 7d014334
...@@ -70,21 +70,20 @@ _UI_Material_constructionDescription_feature = Construction Description ...@@ -70,21 +70,20 @@ _UI_Material_constructionDescription_feature = Construction Description
_UI_Material_disposalEnergy_feature = Disposal Energy _UI_Material_disposalEnergy_feature = Disposal Energy
_UI_Material_disposalCarbon_feature = Disposal Carbon _UI_Material_disposalCarbon_feature = Disposal Carbon
_UI_Material_disposalDescription_feature = Disposal Description _UI_Material_disposalDescription_feature = Disposal Description
_UI_Mounting_type = Mounting
_UI_Layer_type = Layer _UI_Layer_type = Layer
_UI_MaterialCatalog_constructionCategories_feature = Constructions _UI_MaterialCatalog_constructionCategories_feature = Constructions
_UI_ConstructionCategory_name_feature = Construction Category _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_material_feature = Material
_UI_Layer_thickness_feature = Thickness _UI_Layer_thickness_feature = Thickness
_UI_MaterialCategory_materials_feature = Materials _UI_MaterialCategory_materials_feature = Materials
_UI_WindowType_windowTypeId_feature = Window Type Id _UI_WindowType_windowTypeId_feature = Window Type Id
_UI_Material_materialId_feature = Material Id _UI_Material_materialId_feature = Material Id
_UI_Mounting_mountingId_feature = Mounting Id
_UI_Layer__feature = Layer _UI_Layer__feature = Layer
_UI_Material_category_feature = Category _UI_Material_category_feature = Category
_UI_MaterialCategory_name_description = Name of material category _UI_MaterialCategory_name_description = Name of material category
_UI_Material_name_description = Name of material _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
de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/BuildingPhysicsItemProviderAdapterFactory.java
+ 9
- 9
View file @ 7d014334
...@@ -234,26 +234,26 @@ public class BuildingPhysicsItemProviderAdapterFactory extends BuildingPhysicsAd ...@@ -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 --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @generated * @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 --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @generated * @generated
*/ */
@Override @Override
public Adapter createMountingAdapter() { public Adapter createConstructionAdapter() {
if (mountingItemProvider == null) { if (constructionItemProvider == null) {
mountingItemProvider = new MountingItemProvider(this); constructionItemProvider = new ConstructionItemProvider(this);
} }
return mountingItemProvider; return constructionItemProvider;
} }
/** /**
...@@ -398,8 +398,8 @@ public class BuildingPhysicsItemProviderAdapterFactory extends BuildingPhysicsAd ...@@ -398,8 +398,8 @@ public class BuildingPhysicsItemProviderAdapterFactory extends BuildingPhysicsAd
materialItemProvider.dispose(); materialItemProvider.dispose();
if (constructionCategoryItemProvider != null) if (constructionCategoryItemProvider != null)
constructionCategoryItemProvider.dispose(); constructionCategoryItemProvider.dispose();
if (mountingItemProvider != null) if (constructionItemProvider != null)
mountingItemProvider.dispose(); constructionItemProvider.dispose();
if (layerItemProvider != null) if (layerItemProvider != null)
layerItemProvider.dispose(); layerItemProvider.dispose();
} }
......
de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/ConstructionCategoryItemProvider.java
+ 2
- 1
View file @ 7d014334
...@@ -12,6 +12,7 @@ import org.eclipse.emf.common.notify.AdapterFactory; ...@@ -12,6 +12,7 @@ import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.util.ResourceLocator; import org.eclipse.emf.common.util.ResourceLocator;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.provider.IItemLabelProvider;
...@@ -120,7 +121,7 @@ public class ConstructionCategoryItemProvider extends ItemProviderAdapter implem ...@@ -120,7 +121,7 @@ public class ConstructionCategoryItemProvider extends ItemProviderAdapter implem
switch (notification.getFeatureID(ConstructionCategory.class)) { switch (notification.getFeatureID(ConstructionCategory.class)) {
case BuildingPhysicsPackage.CONSTRUCTION_CATEGORY__NAME: case BuildingPhysicsPackage.CONSTRUCTION_CATEGORY__NAME:
case BuildingPhysicsPackage.CONSTRUCTION_CATEGORY__MOUNTINGS: case BuildingPhysicsPackage.CONSTRUCTION_CATEGORY__CONSTRUCTIONS:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return; return;
} }
......
de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/MountingItemProvider.java → de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/ConstructionItemProvider.java
+ 24
- 24
View file @ 7d014334
...@@ -4,7 +4,7 @@ package de.hftstuttgart.buildingphysics.provider; ...@@ -4,7 +4,7 @@ package de.hftstuttgart.buildingphysics.provider;
import de.hftstuttgart.buildingphysics.BuildingPhysicsFactory; import de.hftstuttgart.buildingphysics.BuildingPhysicsFactory;
import de.hftstuttgart.buildingphysics.BuildingPhysicsPackage; import de.hftstuttgart.buildingphysics.BuildingPhysicsPackage;
import de.hftstuttgart.buildingphysics.Mounting; import de.hftstuttgart.buildingphysics.Construction;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
...@@ -28,12 +28,12 @@ import org.eclipse.emf.edit.provider.ItemProviderAdapter; ...@@ -28,12 +28,12 @@ import org.eclipse.emf.edit.provider.ItemProviderAdapter;
import org.eclipse.emf.edit.provider.ViewerNotification; 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 --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @generated * @generated
*/ */
public class MountingItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, public class ConstructionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource { IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
/** /**
* This constructs an instance from a factory and a notifier. * This constructs an instance from a factory and a notifier.
...@@ -41,7 +41,7 @@ public class MountingItemProvider extends ItemProviderAdapter implements IEditin ...@@ -41,7 +41,7 @@ public class MountingItemProvider extends ItemProviderAdapter implements IEditin
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @generated * @generated
*/ */
public MountingItemProvider(AdapterFactory adapterFactory) { public ConstructionItemProvider(AdapterFactory adapterFactory) {
super(adapterFactory); super(adapterFactory);
} }
...@@ -56,25 +56,25 @@ public class MountingItemProvider extends ItemProviderAdapter implements IEditin ...@@ -56,25 +56,25 @@ public class MountingItemProvider extends ItemProviderAdapter implements IEditin
if (itemPropertyDescriptors == null) { if (itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object); super.getPropertyDescriptors(object);
addMountingIdPropertyDescriptor(object); addConstructionIdPropertyDescriptor(object);
addNamePropertyDescriptor(object); addNamePropertyDescriptor(object);
} }
return itemPropertyDescriptors; 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 --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @generated * @generated
*/ */
protected void addMountingIdPropertyDescriptor(Object object) { protected void addConstructionIdPropertyDescriptor(Object object) {
itemPropertyDescriptors itemPropertyDescriptors
.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(), getString("_UI_Mounting_mountingId_feature"), getResourceLocator(), getString("_UI_Construction_constructionId_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_Mounting_mountingId_feature", getString("_UI_PropertyDescriptor_description", "_UI_Construction_constructionId_feature",
"_UI_Mounting_type"), "_UI_Construction_type"),
BuildingPhysicsPackage.Literals.MOUNTING__MOUNTING_ID, true, false, false, BuildingPhysicsPackage.Literals.CONSTRUCTION__CONSTRUCTION_ID, true, false, false,
ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
} }
...@@ -87,10 +87,10 @@ public class MountingItemProvider extends ItemProviderAdapter implements IEditin ...@@ -87,10 +87,10 @@ public class MountingItemProvider extends ItemProviderAdapter implements IEditin
protected void addNamePropertyDescriptor(Object object) { protected void addNamePropertyDescriptor(Object object) {
itemPropertyDescriptors itemPropertyDescriptors
.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(), getString("_UI_Mounting_name_feature"), getResourceLocator(), getString("_UI_Construction_name_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_Mounting_name_feature", getString("_UI_PropertyDescriptor_description", "_UI_Construction_name_feature",
"_UI_Mounting_type"), "_UI_Construction_type"),
BuildingPhysicsPackage.Literals.MOUNTING__NAME, true, false, false, BuildingPhysicsPackage.Literals.CONSTRUCTION__NAME, true, false, false,
ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
} }
...@@ -106,7 +106,7 @@ public class MountingItemProvider extends ItemProviderAdapter implements IEditin ...@@ -106,7 +106,7 @@ public class MountingItemProvider extends ItemProviderAdapter implements IEditin
public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) { public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
if (childrenFeatures == null) { if (childrenFeatures == null) {
super.getChildrenFeatures(object); super.getChildrenFeatures(object);
childrenFeatures.add(BuildingPhysicsPackage.Literals.MOUNTING__LAYERS); childrenFeatures.add(BuildingPhysicsPackage.Literals.CONSTRUCTION__LAYERS);
} }
return childrenFeatures; return childrenFeatures;
} }
...@@ -142,9 +142,9 @@ public class MountingItemProvider extends ItemProviderAdapter implements IEditin ...@@ -142,9 +142,9 @@ public class MountingItemProvider extends ItemProviderAdapter implements IEditin
*/ */
@Override @Override
public String getText(Object object) { public String getText(Object object) {
String label = ((Mounting) object).getName(); String label = ((Construction) object).getName();
return label == null || label.length() == 0 ? getString("_UI_Mounting_type") return label == null || label.length() == 0 ? getString("_UI_Construction_type")
: getString("_UI_Mounting_type") + " " + label; : getString("_UI_Construction_type") + " " + label;
} }
/** /**
...@@ -158,12 +158,12 @@ public class MountingItemProvider extends ItemProviderAdapter implements IEditin ...@@ -158,12 +158,12 @@ public class MountingItemProvider extends ItemProviderAdapter implements IEditin
public void notifyChanged(Notification notification) { public void notifyChanged(Notification notification) {
updateChildren(notification); updateChildren(notification);
switch (notification.getFeatureID(Mounting.class)) { switch (notification.getFeatureID(Construction.class)) {
case BuildingPhysicsPackage.MOUNTING__MOUNTING_ID: case BuildingPhysicsPackage.CONSTRUCTION__CONSTRUCTION_ID:
case BuildingPhysicsPackage.MOUNTING__NAME: case BuildingPhysicsPackage.CONSTRUCTION__NAME:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return; return;
case BuildingPhysicsPackage.MOUNTING__LAYERS: case BuildingPhysicsPackage.CONSTRUCTION__LAYERS:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
return; return;
} }
...@@ -181,7 +181,7 @@ public class MountingItemProvider extends ItemProviderAdapter implements IEditin ...@@ -181,7 +181,7 @@ public class MountingItemProvider extends ItemProviderAdapter implements IEditin
protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) { protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object); super.collectNewChildDescriptors(newChildDescriptors, object);
newChildDescriptors.add(createChildParameter(BuildingPhysicsPackage.Literals.MOUNTING__LAYERS, newChildDescriptors.add(createChildParameter(BuildingPhysicsPackage.Literals.CONSTRUCTION__LAYERS,
BuildingPhysicsFactory.eINSTANCE.createLayer())); BuildingPhysicsFactory.eINSTANCE.createLayer()));
} }
......
de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/MaterialCatalogItemProvider.java
+ 6
- 2
View file @ 7d014334
...@@ -11,7 +11,9 @@ import java.util.List; ...@@ -11,7 +11,9 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification; import org.eclipse.emf.edit.provider.ViewerNotification;
...@@ -103,11 +105,13 @@ public class MaterialCatalogItemProvider extends CatalogItemProvider { ...@@ -103,11 +105,13 @@ public class MaterialCatalogItemProvider extends CatalogItemProvider {
* This returns the label text for the adapted class. * This returns the label text for the adapted class.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @generated NOT * @generated
*/ */
@Override @Override
public String getText(Object object) { 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;
} }
/** /**
......
de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/MaterialCategoryItemProvider.java
+ 1
- 0
View file @ 7d014334
...@@ -12,6 +12,7 @@ import org.eclipse.emf.common.notify.AdapterFactory; ...@@ -12,6 +12,7 @@ import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.util.ResourceLocator; import org.eclipse.emf.common.util.ResourceLocator;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.provider.IItemLabelProvider;
......
de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/WindowCatalogItemProvider.java
+ 5
- 2
View file @ 7d014334
...@@ -10,6 +10,7 @@ import java.util.List; ...@@ -10,6 +10,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification; import org.eclipse.emf.edit.provider.ViewerNotification;
...@@ -70,11 +71,13 @@ public class WindowCatalogItemProvider extends CatalogItemProvider { ...@@ -70,11 +71,13 @@ public class WindowCatalogItemProvider extends CatalogItemProvider {
* This returns the label text for the adapted class. * This returns the label text for the adapted class.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @generated NOT * @generated
*/ */
@Override @Override
public String getText(Object object) { 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;
} }
/** /**
......
de.hftstuttgart.buildingphysics.viewmodel/plugin.xml
+ 1
- 1
View file @ 7d014334
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<?eclipse version="3.4"?> <?eclipse version="3.4"?>
<plugin> <plugin>
<extension point="org.eclipse.emf.ecp.view.model.provider.xmi.file"> <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/ConstructionCategory.view"/>
<file filePath="viewmodels/MaterialCatalog.view"/> <file filePath="viewmodels/MaterialCatalog.view"/>
<file filePath="viewmodels/Material.view"/> <file filePath="viewmodels/Material.view"/>
......
de.hftstuttgart.buildingphysics.viewmodel/viewmodels/Mounting.view → de.hftstuttgart.buildingphysics.viewmodel/viewmodels/Construction.view
+ 6
- 6
View file @ 7d014334
<?xml version="1.0" encoding="UTF-8"?> <?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"> <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#//Mounting"/> <rootEClass href="http://www.hftstuttgart.de/buildingphysics#//Construction"/>
<children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_Hd2ccLPZEeup29SeaUMpQQ" name="Control mountingId"> <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"> <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> </domainModelReference>
</children> </children>
<children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_Hd2ccrPZEeup29SeaUMpQQ" name="Control name"> <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"> <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> </domainModelReference>
</children> </children>
<children xsi:type="org.eclipse.emf.ecp.view.table.model:TableControl" xmi:id="_J63RcLPZEeup29SeaUMpQQ" moveUpDownDisabled="false" detailEditing="WithPanel"> <children xsi:type="org.eclipse.emf.ecp.view.table.model:TableControl" xmi:id="_J63RcLPZEeup29SeaUMpQQ" moveUpDownDisabled="false" detailEditing="WithPanel">
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<domainModelEReferencePath href="http://www.hftstuttgart.de/buildingphysics#//Material/category"/> <domainModelEReferencePath href="http://www.hftstuttgart.de/buildingphysics#//Material/category"/>
</columnDomainModelReferences> </columnDomainModelReferences>
<domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_MkYRYbPZEeup29SeaUMpQQ"> <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>
</domainModelReference> </domainModelReference>
<columnConfigurations xsi:type="org.eclipse.emf.ecp.view.table.model:WidthConfiguration" xmi:id="_d7H2QL8HEeuIHZm4y-I19A" columnDomainReference="_QnRfELPZEeup29SeaUMpQQ" weight="30" minWidth="65"/> <columnConfigurations xsi:type="org.eclipse.emf.ecp.view.table.model:WidthConfiguration" xmi:id="_d7H2QL8HEeuIHZm4y-I19A" columnDomainReference="_QnRfELPZEeup29SeaUMpQQ" weight="30" minWidth="65"/>
......
de.hftstuttgart.buildingphysics.viewmodel/viewmodels/ConstructionCategory.view
+ 8
- 8
View file @ 7d014334
...@@ -7,18 +7,18 @@ ...@@ -7,18 +7,18 @@
</domainModelReference> </domainModelReference>
</children> </children>
<children xsi:type="org.eclipse.emf.ecp.view.table.model:TableControl" xmi:id="_vgicgLeuEeu0KumwacCHxQ" detailEditing="WithPanel"> <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"> <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="_IHsn8L-QEeuIHZm4y-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#//Mounting/mountingId"/> <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.hftstuttgart.de/buildingphysics#//Construction/constructionId"/>
</columnDomainModelReferences> </columnDomainModelReferences>
<columnDomainModelReferences xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_IHsn8b-QEeuIHZm4y-I19A"> <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#//Mounting/name"/> <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.hftstuttgart.de/buildingphysics#//Construction/name"/>
</columnDomainModelReferences> </columnDomainModelReferences>
<domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_yN_hQbeuEeu0KumwacCHxQ"> <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/mountings"/> <domainModelEFeature xsi:type="ecore:EReference" href="http://www.hftstuttgart.de/buildingphysics#//ConstructionCategory/constructions"/>
</domainModelReference> </domainModelReference>
</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> </children>
<ecorePaths>/de.hftstuttgart.buildingphysics/model/buildingphysics.ecore</ecorePaths> <ecorePaths>/de.hftstuttgart.buildingphysics/model/buildingphysics.ecore</ecorePaths>
</org.eclipse.emf.ecp.view.model:View> </org.eclipse.emf.ecp.view.model:View>
de.hftstuttgart.buildingphysics/catalogs/migrateFromSimStadt.xsl
+ 3
- 3
View file @ 7d014334
...@@ -91,9 +91,9 @@ ...@@ -91,9 +91,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" />
......
de.hftstuttgart.buildingphysics/model/buildingphysics.aird
+ 19
- 23
View file @ 7d014334
...@@ -6,9 +6,10 @@ ...@@ -6,9 +6,10 @@
<semanticResources>platform:/resource/de.hftstuttgart.cityunits.model/model/Quantities.ecore</semanticResources> <semanticResources>platform:/resource/de.hftstuttgart.cityunits.model/model/Quantities.ecore</semanticResources>
<semanticResources>platform:/resource/de.hftstuttgart.cityunits.model/model/Quantities.genmodel</semanticResources> <semanticResources>platform:/resource/de.hftstuttgart.cityunits.model/model/Quantities.genmodel</semanticResources>
<semanticResources>http://www.hftstuttgart.de/buildingphysics</semanticResources> <semanticResources>http://www.hftstuttgart.de/buildingphysics</semanticResources>
<semanticResources>../catalogs/2020%20German%20Buildings%20IWU.xmi</semanticResources>
<ownedViews xmi:type="viewpoint:DView" uid="_nfHygB3ZEeuNsK3dZmTkbQ"> <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']"/> <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']"/> <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#/"/> <target xmi:type="ecore:EPackage" href="buildingphysics.ecore#/"/>
</ownedRepresentationDescriptors> </ownedRepresentationDescriptors>
...@@ -880,9 +881,9 @@ ...@@ -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']"/> <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>
</ownedDiagramElements> </ownedDiagramElements>
<ownedDiagramElements xmi:type="diagram:DNodeList" uid="_i_7mkbCmEeup29SeaUMpQQ" name="Mounting" tooltipText="" outgoingEdges="_jAMFQLCmEeup29SeaUMpQQ" incomingEdges="_jAK3JrCmEeup29SeaUMpQQ" width="12" height="10"> <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#//Mounting"/> <target xmi:type="ecore:EClass" href="buildingphysics.ecore#//Construction"/>
<semanticElements xmi:type="ecore:EClass" href="buildingphysics.ecore#//Mounting"/> <semanticElements xmi:type="ecore:EClass" href="buildingphysics.ecore#//Construction"/>
<arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
<arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
<arrangeConstraints>KEEP_RATIO</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
...@@ -890,40 +891,35 @@ ...@@ -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"/> <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> </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']"/> <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=""> <ownedElements xmi:type="diagram:DNodeListElement" uid="_eYlQYL4tEeuIHZm4y-I19A" name="constructionId : EString" tooltipText="">
<target xmi:type="ecore:EAttribute" href="buildingphysics.ecore#//Mounting/mountingId"/> <target xmi:type="ecore:EAttribute" href="buildingphysics.ecore#//Construction/constructionId"/>
<semanticElements xmi:type="ecore:EAttribute" href="buildingphysics.ecore#//Mounting/mountingId"/> <semanticElements xmi:type="ecore:EAttribute" href="buildingphysics.ecore#//Construction/constructionId"/>
<ownedStyle xmi:type="diagram:BundledImage" uid="_eYlQYb4tEeuIHZm4y-I19A" labelAlignment="LEFT" description="_J2qHNJUqEeudooziRGqkJA"> <ownedStyle xmi:type="diagram:BundledImage" uid="_eYlQYb4tEeuIHZm4y-I19A" labelAlignment="LEFT" description="_J2qHNJUqEeudooziRGqkJA">
<labelFormat>bold</labelFormat> <labelFormat>bold</labelFormat>
</ownedStyle> </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']"/> <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>
<ownedElements xmi:type="diagram:DNodeListElement" uid="_jAIa4bCmEeup29SeaUMpQQ" name="name : EString" tooltipText=""> <ownedElements xmi:type="diagram:DNodeListElement" uid="_jAIa4bCmEeup29SeaUMpQQ" name="name : EString" tooltipText="">
<target 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#//Mounting/name"/> <semanticElements xmi:type="ecore:EAttribute" href="buildingphysics.ecore#//Construction/name"/>
<ownedStyle xmi:type="diagram:BundledImage" uid="_jAIa4rCmEeup29SeaUMpQQ" labelAlignment="LEFT" description="_J2qHNJUqEeudooziRGqkJA"> <ownedStyle xmi:type="diagram:BundledImage" uid="_jAIa4rCmEeup29SeaUMpQQ" labelAlignment="LEFT" description="_J2qHNJUqEeudooziRGqkJA">
<labelFormat>bold</labelFormat> <labelFormat>bold</labelFormat>
</ownedStyle> </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']"/> <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>
</ownedDiagramElements> </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"/> <target xmi:type="ecore:EReference" href="buildingphysics.ecore#//MaterialCatalog/constructionCategories"/>
<semanticElements 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"> <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="_jAK3IrCmEeup29SeaUMpQQ" showIcon="false"> <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_NLg8jsBTEeuIHZm4y-I19A" showIcon="false"/>
<customFeatures>labelSize</customFeatures> <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_NLg8jcBTEeuIHZm4y-I19A" labelSize="6" showIcon="false" labelColor="39,76,114"/>
<labelFormat>bold</labelFormat>
</centerLabelStyle>
<endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_jAK3IbCmEeup29SeaUMpQQ" showIcon="false" labelColor="39,76,114">
<customFeatures>labelSize</customFeatures>
</endLabelStyle>
</ownedStyle> </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']"/> <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>
<ownedDiagramElements xmi:type="diagram:DEdge" uid="_jAK3JrCmEeup29SeaUMpQQ" name="[0..*] mountings" sourceNode="_i_5KU7CmEeup29SeaUMpQQ" targetNode="_i_7mkbCmEeup29SeaUMpQQ"> <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/mountings"/> <target xmi:type="ecore:EReference" href="buildingphysics.ecore#//ConstructionCategory/constructions"/>
<semanticElements xmi:type="ecore:EReference" href="buildingphysics.ecore#//ConstructionCategory/mountings"/> <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"> <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"> <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_jALeMrCmEeup29SeaUMpQQ" showIcon="false">
<customFeatures>labelSize</customFeatures> <customFeatures>labelSize</customFeatures>
...@@ -949,8 +945,8 @@ ...@@ -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']"/> <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>
<ownedDiagramElements xmi:type="diagram:DEdge" uid="_jAMFQLCmEeup29SeaUMpQQ" name="[1..*] layers" sourceNode="_i_7mkbCmEeup29SeaUMpQQ" targetNode="_i_5xYrCmEeup29SeaUMpQQ"> <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"/> <target xmi:type="ecore:EReference" href="buildingphysics.ecore#//Construction/layers"/>
<semanticElements xmi:type="ecore:EReference" href="buildingphysics.ecore#//Mounting/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"> <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"> <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_jAMFQ7CmEeup29SeaUMpQQ" showIcon="false">
<customFeatures>labelSize</customFeatures> <customFeatures>labelSize</customFeatures>
......
de.hftstuttgart.buildingphysics/model/buildingphysics.ecore
+ 4
- 4
View file @ 7d014334
...@@ -102,11 +102,11 @@ ...@@ -102,11 +102,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"
......
de.hftstuttgart.buildingphysics/model/buildingphysics.genmodel
+ 5
- 5
View file @ 7d014334
...@@ -63,12 +63,12 @@ ...@@ -63,12 +63,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"
......
de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/BuildingPhysicsFactory.java
+ 3
- 3
View file @ 7d014334
...@@ -85,13 +85,13 @@ public interface BuildingPhysicsFactory extends EFactory { ...@@ -85,13 +85,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>'.
......
de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/BuildingPhysicsPackage.java
+ 45
- 45
View file @ 7d014334
...@@ -641,13 +641,13 @@ public interface BuildingPhysicsPackage extends EPackage { ...@@ -641,13 +641,13 @@ public interface BuildingPhysicsPackage extends EPackage {
int CONSTRUCTION_CATEGORY__NAME = 0; 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 --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @generated * @generated
* @ordered * @ordered
*/ */
int CONSTRUCTION_CATEGORY__MOUNTINGS = 1; int CONSTRUCTION_CATEGORY__CONSTRUCTIONS = 1;
/** /**
* The number of structural features of the '<em>Construction Category</em>' class. * The number of structural features of the '<em>Construction Category</em>' class.
...@@ -668,23 +668,23 @@ public interface BuildingPhysicsPackage extends EPackage { ...@@ -668,23 +668,23 @@ public interface BuildingPhysicsPackage extends EPackage {
int CONSTRUCTION_CATEGORY_OPERATION_COUNT = 0; 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 --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @see de.hftstuttgart.buildingphysics.impl.MountingImpl * @see de.hftstuttgart.buildingphysics.impl.ConstructionImpl
* @see de.hftstuttgart.buildingphysics.impl.BuildingPhysicsPackageImpl#getMounting() * @see de.hftstuttgart.buildingphysics.impl.BuildingPhysicsPackageImpl#getConstruction()
* @generated * @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 --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @generated * @generated
* @ordered * @ordered
*/ */
int MOUNTING__MOUNTING_ID = 0; int CONSTRUCTION__CONSTRUCTION_ID = 0;
/** /**
* The feature id for the '<em><b>Name</b></em>' attribute. * The feature id for the '<em><b>Name</b></em>' attribute.
...@@ -693,7 +693,7 @@ public interface BuildingPhysicsPackage extends EPackage { ...@@ -693,7 +693,7 @@ public interface BuildingPhysicsPackage extends EPackage {
* @generated * @generated
* @ordered * @ordered
*/ */
int MOUNTING__NAME = 1; int CONSTRUCTION__NAME = 1;
/** /**
* The feature id for the '<em><b>Layers</b></em>' containment reference list. * The feature id for the '<em><b>Layers</b></em>' containment reference list.
...@@ -702,25 +702,25 @@ public interface BuildingPhysicsPackage extends EPackage { ...@@ -702,25 +702,25 @@ public interface BuildingPhysicsPackage extends EPackage {
* @generated * @generated
* @ordered * @ordered
*/ */
int MOUNTING__LAYERS = 2; int CONSTRUCTION__LAYERS = 2;
/** /**
* The number of structural features of the '<em>Mounting</em>' class. * The number of structural features of the '<em>Construction</em>' class.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @generated * @generated
* @ordered * @ordered
*/ */
int MOUNTING_FEATURE_COUNT = 3; int CONSTRUCTION_FEATURE_COUNT = 3;
/** /**
* The number of operations of the '<em>Mounting</em>' class. * The number of operations of the '<em>Construction</em>' class.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @generated * @generated
* @ordered * @ordered
*/ */
int MOUNTING_OPERATION_COUNT = 0; int CONSTRUCTION_OPERATION_COUNT = 0;
/** /**
* The meta object id for the '{@link de.hftstuttgart.buildingphysics.impl.LayerImpl <em>Layer</em>}' class. * The meta object id for the '{@link de.hftstuttgart.buildingphysics.impl.LayerImpl <em>Layer</em>}' class.
...@@ -1245,58 +1245,58 @@ public interface BuildingPhysicsPackage extends EPackage { ...@@ -1245,58 +1245,58 @@ public interface BuildingPhysicsPackage extends EPackage {
EAttribute getConstructionCategory_Name(); EAttribute getConstructionCategory_Name();
/** /**
* Returns the meta object for the containment reference list '{@link de.hftstuttgart.buildingphysics.ConstructionCategory#getMountings <em>Mountings</em>}'. * Returns the meta object for the containment reference list '{@link de.hftstuttgart.buildingphysics.ConstructionCategory#getConstructions <em>Constructions</em>}'.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @return the meta object for the containment reference list '<em>Mountings</em>'. * @return the meta object for the containment reference list '<em>Constructions</em>'.
* @see de.hftstuttgart.buildingphysics.ConstructionCategory#getMountings() * @see de.hftstuttgart.buildingphysics.ConstructionCategory#getConstructions()
* @see #getConstructionCategory() * @see #getConstructionCategory()
* @generated * @generated
*/ */
EReference getConstructionCategory_Mountings(); EReference getConstructionCategory_Constructions();
/** /**
* Returns the meta object for class '{@link de.hftstuttgart.buildingphysics.Mounting <em>Mounting</em>}'. * Returns the meta object for class '{@link de.hftstuttgart.buildingphysics.Construction <em>Construction</em>}'.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @return the meta object for class '<em>Mounting</em>'. * @return the meta object for class '<em>Construction</em>'.
* @see de.hftstuttgart.buildingphysics.Mounting * @see de.hftstuttgart.buildingphysics.Construction
* @generated * @generated
*/ */
EClass getMounting(); EClass getConstruction();
/** /**
* Returns the meta object for the attribute '{@link de.hftstuttgart.buildingphysics.Mounting#getMountingId <em>Mounting Id</em>}'. * Returns the meta object for the attribute '{@link de.hftstuttgart.buildingphysics.Construction#getConstructionId <em>Construction Id</em>}'.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Mounting Id</em>'. * @return the meta object for the attribute '<em>Construction Id</em>'.
* @see de.hftstuttgart.buildingphysics.Mounting#getMountingId() * @see de.hftstuttgart.buildingphysics.Construction#getConstructionId()
* @see #getMounting() * @see #getConstruction()
* @generated * @generated
*/ */
EAttribute getMounting_MountingId(); EAttribute getConstruction_ConstructionId();
/** /**
* Returns the meta object for the attribute '{@link de.hftstuttgart.buildingphysics.Mounting#getName <em>Name</em>}'. * Returns the meta object for the attribute '{@link de.hftstuttgart.buildingphysics.Construction#getName <em>Name</em>}'.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Name</em>'. * @return the meta object for the attribute '<em>Name</em>'.
* @see de.hftstuttgart.buildingphysics.Mounting#getName() * @see de.hftstuttgart.buildingphysics.Construction#getName()
* @see #getMounting() * @see #getConstruction()
* @generated * @generated
*/ */
EAttribute getMounting_Name(); EAttribute getConstruction_Name();
/** /**
* Returns the meta object for the containment reference list '{@link de.hftstuttgart.buildingphysics.Mounting#getLayers <em>Layers</em>}'. * Returns the meta object for the containment reference list '{@link de.hftstuttgart.buildingphysics.Construction#getLayers <em>Layers</em>}'.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @return the meta object for the containment reference list '<em>Layers</em>'. * @return the meta object for the containment reference list '<em>Layers</em>'.
* @see de.hftstuttgart.buildingphysics.Mounting#getLayers() * @see de.hftstuttgart.buildingphysics.Construction#getLayers()
* @see #getMounting() * @see #getConstruction()
* @generated * @generated
*/ */
EReference getMounting_Layers(); EReference getConstruction_Layers();
/** /**
* Returns the meta object for class '{@link de.hftstuttgart.buildingphysics.Layer <em>Layer</em>}'. * Returns the meta object for class '{@link de.hftstuttgart.buildingphysics.Layer <em>Layer</em>}'.
...@@ -1722,30 +1722,30 @@ public interface BuildingPhysicsPackage extends EPackage { ...@@ -1722,30 +1722,30 @@ public interface BuildingPhysicsPackage extends EPackage {
EAttribute CONSTRUCTION_CATEGORY__NAME = eINSTANCE.getConstructionCategory_Name(); EAttribute CONSTRUCTION_CATEGORY__NAME = eINSTANCE.getConstructionCategory_Name();
/** /**
* The meta object literal for the '<em><b>Mountings</b></em>' containment reference list feature. * The meta object literal for the '<em><b>Constructions</b></em>' containment reference list feature.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @generated * @generated
*/ */
EReference CONSTRUCTION_CATEGORY__MOUNTINGS = eINSTANCE.getConstructionCategory_Mountings(); EReference CONSTRUCTION_CATEGORY__CONSTRUCTIONS = eINSTANCE.getConstructionCategory_Constructions();
/** /**
* The meta object literal for the '{@link de.hftstuttgart.buildingphysics.impl.MountingImpl <em>Mounting</em>}' class. * The meta object literal for the '{@link de.hftstuttgart.buildingphysics.impl.ConstructionImpl <em>Construction</em>}' class.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @see de.hftstuttgart.buildingphysics.impl.MountingImpl * @see de.hftstuttgart.buildingphysics.impl.ConstructionImpl
* @see de.hftstuttgart.buildingphysics.impl.BuildingPhysicsPackageImpl#getMounting() * @see de.hftstuttgart.buildingphysics.impl.BuildingPhysicsPackageImpl#getConstruction()
* @generated * @generated
*/ */
EClass MOUNTING = eINSTANCE.getMounting(); EClass CONSTRUCTION = eINSTANCE.getConstruction();
/** /**
* The meta object literal for the '<em><b>Mounting Id</b></em>' attribute feature. * The meta object literal for the '<em><b>Construction Id</b></em>' attribute feature.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @generated * @generated
*/ */
EAttribute MOUNTING__MOUNTING_ID = eINSTANCE.getMounting_MountingId(); EAttribute CONSTRUCTION__CONSTRUCTION_ID = eINSTANCE.getConstruction_ConstructionId();
/** /**
* The meta object literal for the '<em><b>Name</b></em>' attribute feature. * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
...@@ -1753,7 +1753,7 @@ public interface BuildingPhysicsPackage extends EPackage { ...@@ -1753,7 +1753,7 @@ public interface BuildingPhysicsPackage extends EPackage {
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @generated * @generated
*/ */
EAttribute MOUNTING__NAME = eINSTANCE.getMounting_Name(); EAttribute CONSTRUCTION__NAME = eINSTANCE.getConstruction_Name();
/** /**
* The meta object literal for the '<em><b>Layers</b></em>' containment reference list feature. * The meta object literal for the '<em><b>Layers</b></em>' containment reference list feature.
...@@ -1761,7 +1761,7 @@ public interface BuildingPhysicsPackage extends EPackage { ...@@ -1761,7 +1761,7 @@ public interface BuildingPhysicsPackage extends EPackage {
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @generated * @generated
*/ */
EReference MOUNTING__LAYERS = eINSTANCE.getMounting_Layers(); EReference CONSTRUCTION__LAYERS = eINSTANCE.getConstruction_Layers();
/** /**
* The meta object literal for the '{@link de.hftstuttgart.buildingphysics.impl.LayerImpl <em>Layer</em>}' class. * The meta object literal for the '{@link de.hftstuttgart.buildingphysics.impl.LayerImpl <em>Layer</em>}' class.
......
de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/Mounting.java → de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/Construction.java
+ 19
- 19
View file @ 7d014334
...@@ -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
de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/ConstructionCategory.java
+ 6
- 6
View file @ 7d014334
...@@ -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
de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/BuildingPhysicsFactoryImpl.java
+ 5
- 5
View file @ 7d014334
...@@ -70,8 +70,8 @@ public class BuildingPhysicsFactoryImpl extends EFactoryImpl implements Building ...@@ -70,8 +70,8 @@ public class BuildingPhysicsFactoryImpl extends EFactoryImpl implements Building
return createMaterial(); return createMaterial();
case BuildingPhysicsPackage.CONSTRUCTION_CATEGORY: case BuildingPhysicsPackage.CONSTRUCTION_CATEGORY:
return createConstructionCategory(); return createConstructionCategory();
case BuildingPhysicsPackage.MOUNTING: case BuildingPhysicsPackage.CONSTRUCTION:
return createMounting(); return createConstruction();
case BuildingPhysicsPackage.LAYER: case BuildingPhysicsPackage.LAYER:
return createLayer(); return createLayer();
default: default:
...@@ -162,9 +162,9 @@ public class BuildingPhysicsFactoryImpl extends EFactoryImpl implements Building ...@@ -162,9 +162,9 @@ public class BuildingPhysicsFactoryImpl extends EFactoryImpl implements Building
* @generated * @generated
*/ */
@Override @Override
public Mounting createMounting() { public Construction createConstruction() {
MountingImpl mounting = new MountingImpl(); ConstructionImpl construction = new ConstructionImpl();
return mounting; return construction;
} }
/** /**
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Dies ist die Gitlab-Instanz des Transferportals der Hochschule für Technik Stuttgart. Hier geht es zurück zum Portal