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

Rename Mounting to Construction

parent f80d5e31
...@@ -6,12 +6,12 @@ import de.hftstuttgart.buildingphysics.BuildingPhysicsCatalog; ...@@ -6,12 +6,12 @@ import de.hftstuttgart.buildingphysics.BuildingPhysicsCatalog;
import de.hftstuttgart.buildingphysics.BuildingPhysicsFactory; import de.hftstuttgart.buildingphysics.BuildingPhysicsFactory;
import de.hftstuttgart.buildingphysics.BuildingPhysicsPackage; import de.hftstuttgart.buildingphysics.BuildingPhysicsPackage;
import de.hftstuttgart.buildingphysics.Catalog; import de.hftstuttgart.buildingphysics.Catalog;
import de.hftstuttgart.buildingphysics.Construction;
import de.hftstuttgart.buildingphysics.ConstructionCategory; import de.hftstuttgart.buildingphysics.ConstructionCategory;
import de.hftstuttgart.buildingphysics.Layer; import de.hftstuttgart.buildingphysics.Layer;
import de.hftstuttgart.buildingphysics.Material; import de.hftstuttgart.buildingphysics.Material;
import de.hftstuttgart.buildingphysics.MaterialCatalog; import de.hftstuttgart.buildingphysics.MaterialCatalog;
import de.hftstuttgart.buildingphysics.MaterialCategory; import de.hftstuttgart.buildingphysics.MaterialCategory;
import de.hftstuttgart.buildingphysics.Mounting;
import de.hftstuttgart.buildingphysics.WindowCatalog; import de.hftstuttgart.buildingphysics.WindowCatalog;
import de.hftstuttgart.buildingphysics.WindowType; import de.hftstuttgart.buildingphysics.WindowType;
...@@ -92,7 +92,7 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building ...@@ -92,7 +92,7 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @generated * @generated
*/ */
private EClass mountingEClass = null; private EClass constructionEClass = null;
/** /**
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
...@@ -614,7 +614,7 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building ...@@ -614,7 +614,7 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
* @generated * @generated
*/ */
@Override @Override
public EReference getConstructionCategory_Mountings() { public EReference getConstructionCategory_Constructions() {
return (EReference) constructionCategoryEClass.getEStructuralFeatures().get(1); return (EReference) constructionCategoryEClass.getEStructuralFeatures().get(1);
} }
...@@ -624,8 +624,8 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building ...@@ -624,8 +624,8 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
* @generated * @generated
*/ */
@Override @Override
public EClass getMounting() { public EClass getConstruction() {
return mountingEClass; return constructionEClass;
} }
/** /**
...@@ -634,8 +634,8 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building ...@@ -634,8 +634,8 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
* @generated * @generated
*/ */
@Override @Override
public EAttribute getMounting_MountingId() { public EAttribute getConstruction_ConstructionId() {
return (EAttribute) mountingEClass.getEStructuralFeatures().get(0); return (EAttribute) constructionEClass.getEStructuralFeatures().get(0);
} }
/** /**
...@@ -644,8 +644,8 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building ...@@ -644,8 +644,8 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
* @generated * @generated
*/ */
@Override @Override
public EAttribute getMounting_Name() { public EAttribute getConstruction_Name() {
return (EAttribute) mountingEClass.getEStructuralFeatures().get(1); return (EAttribute) constructionEClass.getEStructuralFeatures().get(1);
} }
/** /**
...@@ -654,8 +654,8 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building ...@@ -654,8 +654,8 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
* @generated * @generated
*/ */
@Override @Override
public EReference getMounting_Layers() { public EReference getConstruction_Layers() {
return (EReference) mountingEClass.getEStructuralFeatures().get(2); return (EReference) constructionEClass.getEStructuralFeatures().get(2);
} }
/** /**
...@@ -769,12 +769,12 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building ...@@ -769,12 +769,12 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
constructionCategoryEClass = createEClass(CONSTRUCTION_CATEGORY); constructionCategoryEClass = createEClass(CONSTRUCTION_CATEGORY);
createEAttribute(constructionCategoryEClass, CONSTRUCTION_CATEGORY__NAME); createEAttribute(constructionCategoryEClass, CONSTRUCTION_CATEGORY__NAME);
createEReference(constructionCategoryEClass, CONSTRUCTION_CATEGORY__MOUNTINGS); createEReference(constructionCategoryEClass, CONSTRUCTION_CATEGORY__CONSTRUCTIONS);
mountingEClass = createEClass(MOUNTING); constructionEClass = createEClass(CONSTRUCTION);
createEAttribute(mountingEClass, MOUNTING__MOUNTING_ID); createEAttribute(constructionEClass, CONSTRUCTION__CONSTRUCTION_ID);
createEAttribute(mountingEClass, MOUNTING__NAME); createEAttribute(constructionEClass, CONSTRUCTION__NAME);
createEReference(mountingEClass, MOUNTING__LAYERS); createEReference(constructionEClass, CONSTRUCTION__LAYERS);
layerEClass = createEClass(LAYER); layerEClass = createEClass(LAYER);
createEReference(layerEClass, LAYER__MATERIAL); createEReference(layerEClass, LAYER__MATERIAL);
...@@ -941,17 +941,18 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building ...@@ -941,17 +941,18 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
initEAttribute(getConstructionCategory_Name(), ecorePackage.getEString(), "name", null, 1, 1, initEAttribute(getConstructionCategory_Name(), ecorePackage.getEString(), "name", null, 1, 1,
ConstructionCategory.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, ConstructionCategory.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
IS_UNIQUE, !IS_DERIVED, IS_ORDERED); IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getConstructionCategory_Mountings(), this.getMounting(), null, "mountings", null, 0, -1, initEReference(getConstructionCategory_Constructions(), this.getConstruction(), null, "constructions", null, 0,
ConstructionCategory.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, -1, ConstructionCategory.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(mountingEClass, Mounting.class, "Mounting", !IS_ABSTRACT, !IS_INTERFACE, initEClass(constructionEClass, Construction.class, "Construction", !IS_ABSTRACT, !IS_INTERFACE,
IS_GENERATED_INSTANCE_CLASS); IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getMounting_MountingId(), ecorePackage.getEString(), "mountingId", null, 1, 1, Mounting.class, initEAttribute(getConstruction_ConstructionId(), ecorePackage.getEString(), "constructionId", null, 1, 1,
!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); Construction.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE,
initEAttribute(getMounting_Name(), ecorePackage.getEString(), "name", null, 1, 1, Mounting.class, !IS_TRANSIENT, !IS_DERIVED, IS_ORDERED);
!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getConstruction_Name(), ecorePackage.getEString(), "name", null, 1, 1, Construction.class,
initEReference(getMounting_Layers(), this.getLayer(), null, "layers", null, 1, -1, Mounting.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getConstruction_Layers(), this.getLayer(), null, "layers", null, 1, -1, Construction.class,
!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
IS_UNIQUE, !IS_DERIVED, IS_ORDERED); IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
package de.hftstuttgart.buildingphysics.impl; package de.hftstuttgart.buildingphysics.impl;
import de.hftstuttgart.buildingphysics.BuildingPhysicsPackage; import de.hftstuttgart.buildingphysics.BuildingPhysicsPackage;
import de.hftstuttgart.buildingphysics.Construction;
import de.hftstuttgart.buildingphysics.ConstructionCategory; import de.hftstuttgart.buildingphysics.ConstructionCategory;
import de.hftstuttgart.buildingphysics.Mounting;
import java.util.Collection; import java.util.Collection;
...@@ -31,7 +31,7 @@ import org.eclipse.emf.ecore.util.InternalEList; ...@@ -31,7 +31,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
* </p> * </p>
* <ul> * <ul>
* <li>{@link de.hftstuttgart.buildingphysics.impl.ConstructionCategoryImpl#getName <em>Name</em>}</li> * <li>{@link de.hftstuttgart.buildingphysics.impl.ConstructionCategoryImpl#getName <em>Name</em>}</li>
* <li>{@link de.hftstuttgart.buildingphysics.impl.ConstructionCategoryImpl#getMountings <em>Mountings</em>}</li> * <li>{@link de.hftstuttgart.buildingphysics.impl.ConstructionCategoryImpl#getConstructions <em>Constructions</em>}</li>
* </ul> * </ul>
* *
* @generated * @generated
...@@ -58,14 +58,14 @@ public class ConstructionCategoryImpl extends MinimalEObjectImpl.Container imple ...@@ -58,14 +58,14 @@ public class ConstructionCategoryImpl extends MinimalEObjectImpl.Container imple
protected String name = NAME_EDEFAULT; protected String name = NAME_EDEFAULT;
/** /**
* The cached value of the '{@link #getMountings() <em>Mountings</em>}' containment reference list. * The cached value of the '{@link #getConstructions() <em>Constructions</em>}' containment reference list.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @see #getMountings() * @see #getConstructions()
* @generated * @generated
* @ordered * @ordered
*/ */
protected EList<Mounting> mountings; protected EList<Construction> constructions;
/** /**
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
...@@ -116,12 +116,12 @@ public class ConstructionCategoryImpl extends MinimalEObjectImpl.Container imple ...@@ -116,12 +116,12 @@ public class ConstructionCategoryImpl extends MinimalEObjectImpl.Container imple
* @generated * @generated
*/ */
@Override @Override
public EList<Mounting> getMountings() { public EList<Construction> getConstructions() {
if (mountings == null) { if (constructions == null) {
mountings = new EObjectContainmentEList<Mounting>(Mounting.class, this, constructions = new EObjectContainmentEList<Construction>(Construction.class, this,
BuildingPhysicsPackage.CONSTRUCTION_CATEGORY__MOUNTINGS); BuildingPhysicsPackage.CONSTRUCTION_CATEGORY__CONSTRUCTIONS);
} }
return mountings; return constructions;
} }
/** /**
...@@ -132,8 +132,8 @@ public class ConstructionCategoryImpl extends MinimalEObjectImpl.Container imple ...@@ -132,8 +132,8 @@ public class ConstructionCategoryImpl extends MinimalEObjectImpl.Container imple
@Override @Override
public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
switch (featureID) { switch (featureID) {
case BuildingPhysicsPackage.CONSTRUCTION_CATEGORY__MOUNTINGS: case BuildingPhysicsPackage.CONSTRUCTION_CATEGORY__CONSTRUCTIONS:
return ((InternalEList<?>) getMountings()).basicRemove(otherEnd, msgs); return ((InternalEList<?>) getConstructions()).basicRemove(otherEnd, msgs);
} }
return super.eInverseRemove(otherEnd, featureID, msgs); return super.eInverseRemove(otherEnd, featureID, msgs);
} }
...@@ -148,8 +148,8 @@ public class ConstructionCategoryImpl extends MinimalEObjectImpl.Container imple ...@@ -148,8 +148,8 @@ public class ConstructionCategoryImpl extends MinimalEObjectImpl.Container imple
switch (featureID) { switch (featureID) {
case BuildingPhysicsPackage.CONSTRUCTION_CATEGORY__NAME: case BuildingPhysicsPackage.CONSTRUCTION_CATEGORY__NAME:
return getName(); return getName();
case BuildingPhysicsPackage.CONSTRUCTION_CATEGORY__MOUNTINGS: case BuildingPhysicsPackage.CONSTRUCTION_CATEGORY__CONSTRUCTIONS:
return getMountings(); return getConstructions();
} }
return super.eGet(featureID, resolve, coreType); return super.eGet(featureID, resolve, coreType);
} }
...@@ -166,9 +166,9 @@ public class ConstructionCategoryImpl extends MinimalEObjectImpl.Container imple ...@@ -166,9 +166,9 @@ public class ConstructionCategoryImpl extends MinimalEObjectImpl.Container imple
case BuildingPhysicsPackage.CONSTRUCTION_CATEGORY__NAME: case BuildingPhysicsPackage.CONSTRUCTION_CATEGORY__NAME:
setName((String) newValue); setName((String) newValue);
return; return;
case BuildingPhysicsPackage.CONSTRUCTION_CATEGORY__MOUNTINGS: case BuildingPhysicsPackage.CONSTRUCTION_CATEGORY__CONSTRUCTIONS:
getMountings().clear(); getConstructions().clear();
getMountings().addAll((Collection<? extends Mounting>) newValue); getConstructions().addAll((Collection<? extends Construction>) newValue);
return; return;
} }
super.eSet(featureID, newValue); super.eSet(featureID, newValue);
...@@ -185,8 +185,8 @@ public class ConstructionCategoryImpl extends MinimalEObjectImpl.Container imple ...@@ -185,8 +185,8 @@ public class ConstructionCategoryImpl extends MinimalEObjectImpl.Container imple
case BuildingPhysicsPackage.CONSTRUCTION_CATEGORY__NAME: case BuildingPhysicsPackage.CONSTRUCTION_CATEGORY__NAME:
setName(NAME_EDEFAULT); setName(NAME_EDEFAULT);
return; return;
case BuildingPhysicsPackage.CONSTRUCTION_CATEGORY__MOUNTINGS: case BuildingPhysicsPackage.CONSTRUCTION_CATEGORY__CONSTRUCTIONS:
getMountings().clear(); getConstructions().clear();
return; return;
} }
super.eUnset(featureID); super.eUnset(featureID);
...@@ -202,8 +202,8 @@ public class ConstructionCategoryImpl extends MinimalEObjectImpl.Container imple ...@@ -202,8 +202,8 @@ public class ConstructionCategoryImpl extends MinimalEObjectImpl.Container imple
switch (featureID) { switch (featureID) {
case BuildingPhysicsPackage.CONSTRUCTION_CATEGORY__NAME: case BuildingPhysicsPackage.CONSTRUCTION_CATEGORY__NAME:
return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
case BuildingPhysicsPackage.CONSTRUCTION_CATEGORY__MOUNTINGS: case BuildingPhysicsPackage.CONSTRUCTION_CATEGORY__CONSTRUCTIONS:
return mountings != null && !mountings.isEmpty(); return constructions != null && !constructions.isEmpty();
} }
return super.eIsSet(featureID); return super.eIsSet(featureID);
} }
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
package de.hftstuttgart.buildingphysics.impl; package de.hftstuttgart.buildingphysics.impl;
import de.hftstuttgart.buildingphysics.BuildingPhysicsPackage; import de.hftstuttgart.buildingphysics.BuildingPhysicsPackage;
import de.hftstuttgart.buildingphysics.Construction;
import de.hftstuttgart.buildingphysics.Layer; import de.hftstuttgart.buildingphysics.Layer;
import de.hftstuttgart.buildingphysics.Mounting;
import java.util.Collection; import java.util.Collection;
...@@ -24,39 +24,39 @@ import org.eclipse.emf.ecore.util.InternalEList; ...@@ -24,39 +24,39 @@ import org.eclipse.emf.ecore.util.InternalEList;
/** /**
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* An implementation of the model object '<em><b>Mounting</b></em>'. * An implementation of the model object '<em><b>Construction</b></em>'.
* <!-- end-user-doc --> * <!-- end-user-doc -->
* <p> * <p>
* The following features are implemented: * The following features are implemented:
* </p> * </p>
* <ul> * <ul>
* <li>{@link de.hftstuttgart.buildingphysics.impl.MountingImpl#getMountingId <em>Mounting Id</em>}</li> * <li>{@link de.hftstuttgart.buildingphysics.impl.ConstructionImpl#getConstructionId <em>Construction Id</em>}</li>
* <li>{@link de.hftstuttgart.buildingphysics.impl.MountingImpl#getName <em>Name</em>}</li> * <li>{@link de.hftstuttgart.buildingphysics.impl.ConstructionImpl#getName <em>Name</em>}</li>
* <li>{@link de.hftstuttgart.buildingphysics.impl.MountingImpl#getLayers <em>Layers</em>}</li> * <li>{@link de.hftstuttgart.buildingphysics.impl.ConstructionImpl#getLayers <em>Layers</em>}</li>
* </ul> * </ul>
* *
* @generated * @generated
*/ */
public class MountingImpl extends MinimalEObjectImpl.Container implements Mounting { public class ConstructionImpl extends MinimalEObjectImpl.Container implements Construction {
/** /**
* The default value of the '{@link #getMountingId() <em>Mounting Id</em>}' attribute. * The default value of the '{@link #getConstructionId() <em>Construction Id</em>}' attribute.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @see #getMountingId() * @see #getConstructionId()
* @generated * @generated
* @ordered * @ordered
*/ */
protected static final String MOUNTING_ID_EDEFAULT = null; protected static final String CONSTRUCTION_ID_EDEFAULT = null;
/** /**
* The cached value of the '{@link #getMountingId() <em>Mounting Id</em>}' attribute. * The cached value of the '{@link #getConstructionId() <em>Construction Id</em>}' attribute.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @see #getMountingId() * @see #getConstructionId()
* @generated * @generated
* @ordered * @ordered
*/ */
protected String mountingId = MOUNTING_ID_EDEFAULT; protected String constructionId = CONSTRUCTION_ID_EDEFAULT;
/** /**
* The default value of the '{@link #getName() <em>Name</em>}' attribute. * The default value of the '{@link #getName() <em>Name</em>}' attribute.
...@@ -93,7 +93,7 @@ public class MountingImpl extends MinimalEObjectImpl.Container implements Mounti ...@@ -93,7 +93,7 @@ public class MountingImpl extends MinimalEObjectImpl.Container implements Mounti
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @generated * @generated
*/ */
protected MountingImpl() { protected ConstructionImpl() {
super(); super();
} }
...@@ -104,7 +104,7 @@ public class MountingImpl extends MinimalEObjectImpl.Container implements Mounti ...@@ -104,7 +104,7 @@ public class MountingImpl extends MinimalEObjectImpl.Container implements Mounti
*/ */
@Override @Override
protected EClass eStaticClass() { protected EClass eStaticClass() {
return BuildingPhysicsPackage.Literals.MOUNTING; return BuildingPhysicsPackage.Literals.CONSTRUCTION;
} }
/** /**
...@@ -113,8 +113,8 @@ public class MountingImpl extends MinimalEObjectImpl.Container implements Mounti ...@@ -113,8 +113,8 @@ public class MountingImpl extends MinimalEObjectImpl.Container implements Mounti
* @generated * @generated
*/ */
@Override @Override
public String getMountingId() { public String getConstructionId() {
return mountingId; return constructionId;
} }
/** /**
...@@ -123,12 +123,12 @@ public class MountingImpl extends MinimalEObjectImpl.Container implements Mounti ...@@ -123,12 +123,12 @@ public class MountingImpl extends MinimalEObjectImpl.Container implements Mounti
* @generated * @generated
*/ */
@Override @Override
public void setMountingId(String newMountingId) { public void setConstructionId(String newConstructionId) {
String oldMountingId = mountingId; String oldConstructionId = constructionId;
mountingId = newMountingId; constructionId = newConstructionId;
if (eNotificationRequired()) if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, BuildingPhysicsPackage.MOUNTING__MOUNTING_ID, eNotify(new ENotificationImpl(this, Notification.SET, BuildingPhysicsPackage.CONSTRUCTION__CONSTRUCTION_ID,
oldMountingId, mountingId)); oldConstructionId, constructionId));
} }
/** /**
...@@ -151,7 +151,7 @@ public class MountingImpl extends MinimalEObjectImpl.Container implements Mounti ...@@ -151,7 +151,7 @@ public class MountingImpl extends MinimalEObjectImpl.Container implements Mounti
String oldName = name; String oldName = name;
name = newName; name = newName;
if (eNotificationRequired()) if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, BuildingPhysicsPackage.MOUNTING__NAME, oldName, eNotify(new ENotificationImpl(this, Notification.SET, BuildingPhysicsPackage.CONSTRUCTION__NAME, oldName,
name)); name));
} }
...@@ -163,7 +163,7 @@ public class MountingImpl extends MinimalEObjectImpl.Container implements Mounti ...@@ -163,7 +163,7 @@ public class MountingImpl extends MinimalEObjectImpl.Container implements Mounti
@Override @Override
public EList<Layer> getLayers() { public EList<Layer> getLayers() {
if (layers == null) { if (layers == null) {
layers = new EObjectContainmentEList<Layer>(Layer.class, this, BuildingPhysicsPackage.MOUNTING__LAYERS); layers = new EObjectContainmentEList<Layer>(Layer.class, this, BuildingPhysicsPackage.CONSTRUCTION__LAYERS);
} }
return layers; return layers;
} }
...@@ -176,7 +176,7 @@ public class MountingImpl extends MinimalEObjectImpl.Container implements Mounti ...@@ -176,7 +176,7 @@ public class MountingImpl extends MinimalEObjectImpl.Container implements Mounti
@Override @Override
public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
switch (featureID) { switch (featureID) {
case BuildingPhysicsPackage.MOUNTING__LAYERS: case BuildingPhysicsPackage.CONSTRUCTION__LAYERS:
return ((InternalEList<?>) getLayers()).basicRemove(otherEnd, msgs); return ((InternalEList<?>) getLayers()).basicRemove(otherEnd, msgs);
} }
return super.eInverseRemove(otherEnd, featureID, msgs); return super.eInverseRemove(otherEnd, featureID, msgs);
...@@ -190,11 +190,11 @@ public class MountingImpl extends MinimalEObjectImpl.Container implements Mounti ...@@ -190,11 +190,11 @@ public class MountingImpl extends MinimalEObjectImpl.Container implements Mounti
@Override @Override
public Object eGet(int featureID, boolean resolve, boolean coreType) { public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) { switch (featureID) {
case BuildingPhysicsPackage.MOUNTING__MOUNTING_ID: case BuildingPhysicsPackage.CONSTRUCTION__CONSTRUCTION_ID:
return getMountingId(); return getConstructionId();
case BuildingPhysicsPackage.MOUNTING__NAME: case BuildingPhysicsPackage.CONSTRUCTION__NAME:
return getName(); return getName();
case BuildingPhysicsPackage.MOUNTING__LAYERS: case BuildingPhysicsPackage.CONSTRUCTION__LAYERS:
return getLayers(); return getLayers();
} }
return super.eGet(featureID, resolve, coreType); return super.eGet(featureID, resolve, coreType);
...@@ -209,13 +209,13 @@ public class MountingImpl extends MinimalEObjectImpl.Container implements Mounti ...@@ -209,13 +209,13 @@ public class MountingImpl extends MinimalEObjectImpl.Container implements Mounti
@Override @Override
public void eSet(int featureID, Object newValue) { public void eSet(int featureID, Object newValue) {
switch (featureID) { switch (featureID) {
case BuildingPhysicsPackage.MOUNTING__MOUNTING_ID: case BuildingPhysicsPackage.CONSTRUCTION__CONSTRUCTION_ID:
setMountingId((String) newValue); setConstructionId((String) newValue);
return; return;
case BuildingPhysicsPackage.MOUNTING__NAME: case BuildingPhysicsPackage.CONSTRUCTION__NAME:
setName((String) newValue); setName((String) newValue);
return; return;
case BuildingPhysicsPackage.MOUNTING__LAYERS: case BuildingPhysicsPackage.CONSTRUCTION__LAYERS:
getLayers().clear(); getLayers().clear();
getLayers().addAll((Collection<? extends Layer>) newValue); getLayers().addAll((Collection<? extends Layer>) newValue);
return; return;
...@@ -231,13 +231,13 @@ public class MountingImpl extends MinimalEObjectImpl.Container implements Mounti ...@@ -231,13 +231,13 @@ public class MountingImpl extends MinimalEObjectImpl.Container implements Mounti
@Override @Override
public void eUnset(int featureID) { public void eUnset(int featureID) {
switch (featureID) { switch (featureID) {
case BuildingPhysicsPackage.MOUNTING__MOUNTING_ID: case BuildingPhysicsPackage.CONSTRUCTION__CONSTRUCTION_ID:
setMountingId(MOUNTING_ID_EDEFAULT); setConstructionId(CONSTRUCTION_ID_EDEFAULT);
return; return;
case BuildingPhysicsPackage.MOUNTING__NAME: case BuildingPhysicsPackage.CONSTRUCTION__NAME:
setName(NAME_EDEFAULT); setName(NAME_EDEFAULT);
return; return;
case BuildingPhysicsPackage.MOUNTING__LAYERS: case BuildingPhysicsPackage.CONSTRUCTION__LAYERS:
getLayers().clear(); getLayers().clear();
return; return;
} }
...@@ -252,11 +252,12 @@ public class MountingImpl extends MinimalEObjectImpl.Container implements Mounti ...@@ -252,11 +252,12 @@ public class MountingImpl extends MinimalEObjectImpl.Container implements Mounti
@Override @Override
public boolean eIsSet(int featureID) { public boolean eIsSet(int featureID) {
switch (featureID) { switch (featureID) {
case BuildingPhysicsPackage.MOUNTING__MOUNTING_ID: case BuildingPhysicsPackage.CONSTRUCTION__CONSTRUCTION_ID:
return MOUNTING_ID_EDEFAULT == null ? mountingId != null : !MOUNTING_ID_EDEFAULT.equals(mountingId); return CONSTRUCTION_ID_EDEFAULT == null ? constructionId != null
case BuildingPhysicsPackage.MOUNTING__NAME: : !CONSTRUCTION_ID_EDEFAULT.equals(constructionId);
case BuildingPhysicsPackage.CONSTRUCTION__NAME:
return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
case BuildingPhysicsPackage.MOUNTING__LAYERS: case BuildingPhysicsPackage.CONSTRUCTION__LAYERS:
return layers != null && !layers.isEmpty(); return layers != null && !layers.isEmpty();
} }
return super.eIsSet(featureID); return super.eIsSet(featureID);
...@@ -273,12 +274,12 @@ public class MountingImpl extends MinimalEObjectImpl.Container implements Mounti ...@@ -273,12 +274,12 @@ public class MountingImpl extends MinimalEObjectImpl.Container implements Mounti
return super.toString(); return super.toString();
StringBuilder result = new StringBuilder(super.toString()); StringBuilder result = new StringBuilder(super.toString());
result.append(" (mountingId: "); result.append(" (constructionId: ");
result.append(mountingId); result.append(constructionId);
result.append(", name: "); result.append(", name: ");
result.append(name); result.append(name);
result.append(')'); result.append(')');
return result.toString(); return result.toString();
} }
} //MountingImpl } //ConstructionImpl
...@@ -18,6 +18,7 @@ import org.eclipse.emf.ecore.InternalEObject; ...@@ -18,6 +18,7 @@ import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList; import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
import org.eclipse.emf.ecore.util.InternalEList; import org.eclipse.emf.ecore.util.InternalEList;
......
...@@ -4,21 +4,22 @@ package de.hftstuttgart.buildingphysics.impl; ...@@ -4,21 +4,22 @@ package de.hftstuttgart.buildingphysics.impl;
import de.hftstuttgart.buildingphysics.BuildingPhysicsPackage; import de.hftstuttgart.buildingphysics.BuildingPhysicsPackage;
import de.hftstuttgart.buildingphysics.Material; import de.hftstuttgart.buildingphysics.Material;
import de.hftstuttgart.buildingphysics.MaterialCategory; import de.hftstuttgart.buildingphysics.MaterialCategory;
import de.hftstuttgart.cityunits.model.NullableQuantity; import de.hftstuttgart.cityunits.model.NullableQuantity;
import de.hftstuttgart.cityunits.model.quantities.QuantitiesFactory; import de.hftstuttgart.cityunits.model.quantities.QuantitiesFactory;
import de.hftstuttgart.cityunits.model.quantities.QuantitiesPackage; import de.hftstuttgart.cityunits.model.quantities.QuantitiesPackage;
import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.common.notify.NotificationChain;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.ecore.util.EcoreUtil;
/** /**
......
...@@ -107,8 +107,8 @@ public class BuildingPhysicsAdapterFactory extends AdapterFactoryImpl { ...@@ -107,8 +107,8 @@ public class BuildingPhysicsAdapterFactory extends AdapterFactoryImpl {
} }
@Override @Override
public Adapter caseMounting(Mounting object) { public Adapter caseConstruction(Construction object) {
return createMountingAdapter(); return createConstructionAdapter();
} }
@Override @Override
...@@ -248,16 +248,16 @@ public class BuildingPhysicsAdapterFactory extends AdapterFactoryImpl { ...@@ -248,16 +248,16 @@ public class BuildingPhysicsAdapterFactory extends AdapterFactoryImpl {
} }
/** /**
* Creates a new adapter for an object of class '{@link de.hftstuttgart.buildingphysics.Mounting <em>Mounting</em>}'. * Creates a new adapter for an object of class '{@link de.hftstuttgart.buildingphysics.Construction <em>Construction</em>}'.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases; * This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway. * it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @return the new adapter. * @return the new adapter.
* @see de.hftstuttgart.buildingphysics.Mounting * @see de.hftstuttgart.buildingphysics.Construction
* @generated * @generated
*/ */
public Adapter createMountingAdapter() { public Adapter createConstructionAdapter() {
return null; return null;
} }
......
...@@ -126,9 +126,9 @@ public class BuildingPhysicsSwitch<T> extends Switch<T> { ...@@ -126,9 +126,9 @@ public class BuildingPhysicsSwitch<T> extends Switch<T> {
result = defaultCase(theEObject); result = defaultCase(theEObject);
return result; return result;
} }
case BuildingPhysicsPackage.MOUNTING: { case BuildingPhysicsPackage.CONSTRUCTION: {
Mounting mounting = (Mounting) theEObject; Construction construction = (Construction) theEObject;
T result = caseMounting(mounting); T result = caseConstruction(construction);
if (result == null) if (result == null)
result = defaultCase(theEObject); result = defaultCase(theEObject);
return result; return result;
...@@ -266,17 +266,17 @@ public class BuildingPhysicsSwitch<T> extends Switch<T> { ...@@ -266,17 +266,17 @@ public class BuildingPhysicsSwitch<T> extends Switch<T> {
} }
/** /**
* Returns the result of interpreting the object as an instance of '<em>Mounting</em>'. * Returns the result of interpreting the object as an instance of '<em>Construction</em>'.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* This implementation returns null; * This implementation returns null;
* returning a non-null result will terminate the switch. * returning a non-null result will terminate the switch.
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @param object the target of the switch. * @param object the target of the switch.
* @return the result of interpreting the object as an instance of '<em>Mounting</em>'. * @return the result of interpreting the object as an instance of '<em>Construction</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated * @generated
*/ */
public T caseMounting(Mounting object) { public T caseConstruction(Construction object) {
return null; return null;
} }
......
Markdown is supported
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