Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
NeqModPlus
Building Physics
Building Physics Catalog Editor
Commits
7d014334
Commit
7d014334
authored
3 years ago
by
Kai-Holger Brassel
Browse files
Options
Download
Email Patches
Plain Diff
Rename Mounting to Construction
parent
f80d5e31
master
No related merge requests found
Changes
27
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/BuildingPhysicsPackageImpl.java
+25
-24
...gart/buildingphysics/impl/BuildingPhysicsPackageImpl.java
de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/ConstructionCategoryImpl.java
+21
-21
...ttgart/buildingphysics/impl/ConstructionCategoryImpl.java
de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/ConstructionImpl.java
+44
-43
...e/hftstuttgart/buildingphysics/impl/ConstructionImpl.java
de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/MaterialCategoryImpl.java
+1
-0
...tstuttgart/buildingphysics/impl/MaterialCategoryImpl.java
de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/MaterialImpl.java
+4
-3
...rc/de/hftstuttgart/buildingphysics/impl/MaterialImpl.java
de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/util/BuildingPhysicsAdapterFactory.java
+5
-5
...t/buildingphysics/util/BuildingPhysicsAdapterFactory.java
de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/util/BuildingPhysicsSwitch.java
+6
-6
...stuttgart/buildingphysics/util/BuildingPhysicsSwitch.java
with
106 additions
and
102 deletions
+106
-102
de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/BuildingPhysicsPackageImpl.java
+
25
-
24
View file @
7d014334
...
@@ -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
mounting
EClass
=
null
;
private
EClass
construction
EClass
=
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_
Mounting
s
()
{
public
EReference
getConstructionCategory_
Construction
s
()
{
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
get
Mounting
()
{
public
EClass
get
Construction
()
{
return
mounting
EClass
;
return
construction
EClass
;
}
}
/**
/**
...
@@ -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
get
Mounting_Mounting
Id
()
{
public
EAttribute
get
Construction_Construction
Id
()
{
return
(
EAttribute
)
mounting
EClass
.
getEStructuralFeatures
().
get
(
0
);
return
(
EAttribute
)
construction
EClass
.
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
get
Mounting
_Name
()
{
public
EAttribute
get
Construction
_Name
()
{
return
(
EAttribute
)
mounting
EClass
.
getEStructuralFeatures
().
get
(
1
);
return
(
EAttribute
)
construction
EClass
.
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
get
Mounting
_Layers
()
{
public
EReference
get
Construction
_Layers
()
{
return
(
EReference
)
mounting
EClass
.
getEStructuralFeatures
().
get
(
2
);
return
(
EReference
)
construction
EClass
.
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__
MOUNTING
S
);
createEReference
(
constructionCategoryEClass
,
CONSTRUCTION_CATEGORY__
CONSTRUCTION
S
);
mounting
EClass
=
createEClass
(
MOUNTING
);
construction
EClass
=
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_
Mounting
s
(),
this
.
get
Mounting
(),
null
,
"mounting
s"
,
null
,
0
,
-
1
,
initEReference
(
getConstructionCategory_
Construction
s
(),
this
.
get
Construction
(),
null
,
"construction
s"
,
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
);
...
...
This diff is collapsed.
Click to expand it.
de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/ConstructionCategoryImpl.java
+
21
-
21
View file @
7d014334
...
@@ -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#get
Mountings <em>Mounting
s</em>}</li>
* <li>{@link de.hftstuttgart.buildingphysics.impl.ConstructionCategoryImpl#get
Constructions <em>Construction
s</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 #get
Mountings() <em>Mounting
s</em>}' containment reference list.
* The cached value of the '{@link #get
Constructions() <em>Construction
s</em>}' containment reference list.
* <!-- begin-user-doc -->
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* <!-- end-user-doc -->
* @see #get
Mounting
s()
* @see #get
Construction
s()
* @generated
* @generated
* @ordered
* @ordered
*/
*/
protected
EList
<
Mounting
>
mounting
s
;
protected
EList
<
Construction
>
construction
s
;
/**
/**
* <!-- 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
>
getMounting
s
()
{
public
EList
<
Construction
>
getConstruction
s
()
{
if
(
mounting
s
==
null
)
{
if
(
construction
s
==
null
)
{
mounting
s
=
new
EObjectContainmentEList
<
Mounting
>(
Mounting
.
class
,
this
,
construction
s
=
new
EObjectContainmentEList
<
Construction
>(
Construction
.
class
,
this
,
BuildingPhysicsPackage
.
CONSTRUCTION_CATEGORY__
MOUNTING
S
);
BuildingPhysicsPackage
.
CONSTRUCTION_CATEGORY__
CONSTRUCTION
S
);
}
}
return
mounting
s
;
return
construction
s
;
}
}
/**
/**
...
@@ -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__
MOUNTING
S
:
case
BuildingPhysicsPackage
.
CONSTRUCTION_CATEGORY__
CONSTRUCTION
S
:
return
((
InternalEList
<?>)
get
Mounting
s
()).
basicRemove
(
otherEnd
,
msgs
);
return
((
InternalEList
<?>)
get
Construction
s
()).
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__
MOUNTING
S
:
case
BuildingPhysicsPackage
.
CONSTRUCTION_CATEGORY__
CONSTRUCTION
S
:
return
get
Mounting
s
();
return
get
Construction
s
();
}
}
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__
MOUNTING
S
:
case
BuildingPhysicsPackage
.
CONSTRUCTION_CATEGORY__
CONSTRUCTION
S
:
get
Mounting
s
().
clear
();
get
Construction
s
().
clear
();
get
Mounting
s
().
addAll
((
Collection
<?
extends
Mounting
>)
newValue
);
get
Construction
s
().
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__
MOUNTING
S
:
case
BuildingPhysicsPackage
.
CONSTRUCTION_CATEGORY__
CONSTRUCTION
S
:
get
Mounting
s
().
clear
();
get
Construction
s
().
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__
MOUNTING
S
:
case
BuildingPhysicsPackage
.
CONSTRUCTION_CATEGORY__
CONSTRUCTION
S
:
return
mounting
s
!=
null
&&
!
mounting
s
.
isEmpty
();
return
construction
s
!=
null
&&
!
construction
s
.
isEmpty
();
}
}
return
super
.
eIsSet
(
featureID
);
return
super
.
eIsSet
(
featureID
);
}
}
...
...
This diff is collapsed.
Click to expand it.
de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/
Mounting
Impl.java
→
de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/
Construction
Impl.java
+
44
-
43
View file @
7d014334
...
@@ -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.
Mounting
Impl#getName <em>Name</em>}</li>
* <li>{@link de.hftstuttgart.buildingphysics.impl.
Construction
Impl#getName <em>Name</em>}</li>
* <li>{@link de.hftstuttgart.buildingphysics.impl.
Mounting
Impl#getLayers <em>Layers</em>}</li>
* <li>{@link de.hftstuttgart.buildingphysics.impl.
Construction
Impl#getLayers <em>Layers</em>}</li>
* </ul>
* </ul>
*
*
* @generated
* @generated
*/
*/
public
class
Mounting
Impl
extends
MinimalEObjectImpl
.
Container
implements
Mounting
{
public
class
Construction
Impl
extends
MinimalEObjectImpl
.
Container
implements
Construction
{
/**
/**
* The default value of the '{@link #get
MountingId() <em>Mounting
Id</em>}' attribute.
* The default value of the '{@link #get
ConstructionId() <em>Construction
Id</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* <!-- end-user-doc -->
* @see #get
Mounting
Id()
* @see #get
Construction
Id()
* @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 #get
MountingId() <em>Mounting
Id</em>}' attribute.
* The cached value of the '{@link #get
ConstructionId() <em>Construction
Id</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* <!-- end-user-doc -->
* @see #get
Mounting
Id()
* @see #get
Construction
Id()
* @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
Mounting
Impl
()
{
protected
Construction
Impl
()
{
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
get
Mounting
Id
()
{
public
String
get
Construction
Id
()
{
return
mounting
Id
;
return
construction
Id
;
}
}
/**
/**
...
@@ -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
set
Mounting
Id
(
String
new
Mounting
Id
)
{
public
void
set
Construction
Id
(
String
new
Construction
Id
)
{
String
old
MountingId
=
mounting
Id
;
String
old
ConstructionId
=
construction
Id
;
mountingId
=
newMounting
Id
;
constructionId
=
newConstruction
Id
;
if
(
eNotificationRequired
())
if
(
eNotificationRequired
())
eNotify
(
new
ENotificationImpl
(
this
,
Notification
.
SET
,
BuildingPhysicsPackage
.
MOUNTING__MOUNTING
_ID
,
eNotify
(
new
ENotificationImpl
(
this
,
Notification
.
SET
,
BuildingPhysicsPackage
.
CONSTRUCTION__CONSTRUCTION
_ID
,
old
MountingId
,
mounting
Id
));
old
ConstructionId
,
construction
Id
));
}
}
/**
/**
...
@@ -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
get
Mounting
Id
();
return
get
Construction
Id
();
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
:
set
Mounting
Id
((
String
)
newValue
);
set
Construction
Id
((
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
:
set
MountingId
(
MOUNTING
_ID_EDEFAULT
);
set
ConstructionId
(
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
(
" (
mounting
Id: "
);
result
.
append
(
" (
construction
Id: "
);
result
.
append
(
mounting
Id
);
result
.
append
(
construction
Id
);
result
.
append
(
", name: "
);
result
.
append
(
", name: "
);
result
.
append
(
name
);
result
.
append
(
name
);
result
.
append
(
')'
);
result
.
append
(
')'
);
return
result
.
toString
();
return
result
.
toString
();
}
}
}
//
Mounting
Impl
}
//
Construction
Impl
This diff is collapsed.
Click to expand it.
de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/MaterialCategoryImpl.java
+
1
-
0
View file @
7d014334
...
@@ -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
;
...
...
This diff is collapsed.
Click to expand it.
de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/MaterialImpl.java
+
4
-
3
View file @
7d014334
...
@@ -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
;
/**
/**
...
...
This diff is collapsed.
Click to expand it.
de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/util/BuildingPhysicsAdapterFactory.java
+
5
-
5
View file @
7d014334
...
@@ -107,8 +107,8 @@ public class BuildingPhysicsAdapterFactory extends AdapterFactoryImpl {
...
@@ -107,8 +107,8 @@ public class BuildingPhysicsAdapterFactory extends AdapterFactoryImpl {
}
}
@Override
@Override
public
Adapter
case
Mounting
(
Mounting
object
)
{
public
Adapter
case
Construction
(
Construction
object
)
{
return
create
Mounting
Adapter
();
return
create
Construction
Adapter
();
}
}
@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
create
Mounting
Adapter
()
{
public
Adapter
create
Construction
Adapter
()
{
return
null
;
return
null
;
}
}
...
...
This diff is collapsed.
Click to expand it.
de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/util/BuildingPhysicsSwitch.java
+
6
-
6
View file @
7d014334
...
@@ -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
=
case
Mounting
(
mounting
);
T
result
=
case
Construction
(
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
case
Mounting
(
Mounting
object
)
{
public
T
case
Construction
(
Construction
object
)
{
return
null
;
return
null
;
}
}
...
...
This diff is collapsed.
Click to expand it.
Prev
1
2
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Snippets