diff --git a/de.hftstuttgart.buildingphysics.application/META-INF/MANIFEST.MF b/de.hftstuttgart.buildingphysics.application/META-INF/MANIFEST.MF
index 91061feb32b820e625f0a84bfba41dab1952d4dd..caf5d423fd9ab798c7f64b54cb37a607b4ea9e0c 100644
--- a/de.hftstuttgart.buildingphysics.application/META-INF/MANIFEST.MF
+++ b/de.hftstuttgart.buildingphysics.application/META-INF/MANIFEST.MF
@@ -15,7 +15,9 @@ Require-Bundle: javax.inject;bundle-version="0.0.0",
org.eclipse.e4.core.contexts;bundle-version="0.0.0",
org.eclipse.emf.ecore,
org.eclipse.emf.edit,
- org.eclipse.emf.ecp.ui.view.swt
+ org.eclipse.emf.ecp.ui.view.swt,
+ de.hftstuttgart.cityunits.model;bundle-version="1.0.0",
+ de.hftstuttgart.cityunits.ui.renderer;bundle-version="1.0.0"
Import-Package: de.hftstuttgart.buildingphysics,
- javax.annotation;version="0.0.0"
+ javax.annotation;version="1.3.5"
Automatic-Module-Name: de.hftstuttgart.buildingphysics.application
diff --git a/de.hftstuttgart.buildingphysics.application/build.properties b/de.hftstuttgart.buildingphysics.application/build.properties
index 04ab1e9b8f3cd4339dc61f93907610aecbd48895..7747874db96bfdc6a21686774cdc9876a263c41f 100644
--- a/de.hftstuttgart.buildingphysics.application/build.properties
+++ b/de.hftstuttgart.buildingphysics.application/build.properties
@@ -1,5 +1,4 @@
source.. = src/
-output.. = bin/
bin.includes = plugin.xml,\
META-INF/,\
.,\
diff --git a/de.hftstuttgart.buildingphysics.application/src/de/hftstuttgart/buildingphysics/application/handlers/AboutHandler.java b/de.hftstuttgart.buildingphysics.application/src/de/hftstuttgart/buildingphysics/application/handlers/AboutHandler.java
index e848482850ce4d1c0e2d155c586fe079ae361445..798a5786874ad7602666222ee99bd552291f7868 100644
--- a/de.hftstuttgart.buildingphysics.application/src/de/hftstuttgart/buildingphysics/application/handlers/AboutHandler.java
+++ b/de.hftstuttgart.buildingphysics.application/src/de/hftstuttgart/buildingphysics/application/handlers/AboutHandler.java
@@ -1,5 +1,6 @@
package de.hftstuttgart.buildingphysics.application.handlers;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.e4.core.di.annotations.Execute;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.swt.widgets.Shell;
@@ -7,6 +8,14 @@ import org.eclipse.swt.widgets.Shell;
public class AboutHandler {
@Execute
public void execute(Shell shell) {
- MessageDialog.openInformation(shell, "About", "HfT Stuttgart - Building Physics Catalog");
+ String txt = """
+ HfT Stuttgart - Building Physics Catalog
+ ----------------------------------------
+
+ Workspace allowsDefault: %s
+ Workspace getDefault: %s""";
+ MessageDialog.openInformation(shell, "About", String.format(txt,
+ Platform.getInstanceLocation().allowsDefault(),
+ Platform.getInstanceLocation().getDefault()));
}
}
diff --git a/de.hftstuttgart.buildingphysics.application/src/de/hftstuttgart/buildingphysics/application/parts/CatalogPart.java b/de.hftstuttgart.buildingphysics.application/src/de/hftstuttgart/buildingphysics/application/parts/CatalogPart.java
index 6dbd106122e14991dbf31f5457cef22068d8933e..00313811edf51c6922dd33a562f68d2b7f5e97c3 100644
--- a/de.hftstuttgart.buildingphysics.application/src/de/hftstuttgart/buildingphysics/application/parts/CatalogPart.java
+++ b/de.hftstuttgart.buildingphysics.application/src/de/hftstuttgart/buildingphysics/application/parts/CatalogPart.java
@@ -13,6 +13,7 @@ import org.eclipse.emf.ecp.ui.view.swt.ECPSWTViewRenderer;
import org.eclipse.jface.layout.GridLayoutFactory;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Dialog;
/**
* Part for displaying a Forms Editor for a Building Physics Catalog.
diff --git a/de.hftstuttgart.buildingphysics.edit/.classpath b/de.hftstuttgart.buildingphysics.edit/.classpath
index 48cc6cafee283f78d2be10cb4a8eb6f884b111c4..1f0469022c306ea5fefe4b29b6d0eee95d3db009 100644
--- a/de.hftstuttgart.buildingphysics.edit/.classpath
+++ b/de.hftstuttgart.buildingphysics.edit/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src-gen/"/>
+ <classpathentry kind="src" path="src/"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/de.hftstuttgart.buildingphysics.edit/META-INF/MANIFEST.MF b/de.hftstuttgart.buildingphysics.edit/META-INF/MANIFEST.MF
index aa5f5499cc323219fdc6775e8bc90f720863adcd..21a30d1e006ce255648b6258e5fcf4ab8654d87f 100644
--- a/de.hftstuttgart.buildingphysics.edit/META-INF/MANIFEST.MF
+++ b/de.hftstuttgart.buildingphysics.edit/META-INF/MANIFEST.MF
@@ -8,7 +8,6 @@ Bundle-ClassPath: .
Bundle-Activator: de.hftstuttgart.buildingphysics.provider.BuildingPhysicsEditPlugin$Implementation
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: de.hftstuttgart.buildingphysics.provider
Require-Bundle: org.eclipse.core.runtime,
de.hftstuttgart.buildingphysics;visibility:=reexport,
diff --git a/de.hftstuttgart.buildingphysics.edit/build.properties b/de.hftstuttgart.buildingphysics.edit/build.properties
index a3c4e32afd5c06df8bd4f0d371e56479e0822559..3a01a8b17fc0f9206b6c9b52da1132e8def6888d 100644
--- a/de.hftstuttgart.buildingphysics.edit/build.properties
+++ b/de.hftstuttgart.buildingphysics.edit/build.properties
@@ -6,5 +6,4 @@ bin.includes = .,\
plugin.xml,\
plugin.properties
jars.compile.order = .
-source.. = src-gen/
-output.. = bin/
+source.. = src/
diff --git a/de.hftstuttgart.buildingphysics.edit/icons/full/ctool16/CreateBuildingPhysicsCatalog_materialCatalog_MaterialCatalog.gif b/de.hftstuttgart.buildingphysics.edit/icons/full/ctool16/CreateBuildingPhysicsCatalog_materialCatalog_MaterialCatalog.gif
new file mode 100644
index 0000000000000000000000000000000000000000..02c6c3c6949c5435855e9aaef8faafbec57b8275
Binary files /dev/null and b/de.hftstuttgart.buildingphysics.edit/icons/full/ctool16/CreateBuildingPhysicsCatalog_materialCatalog_MaterialCatalog.gif differ
diff --git a/de.hftstuttgart.buildingphysics.edit/icons/full/ctool16/CreateBuildingPhysicsCatalog_windowCatalog_WindowCatalog.gif b/de.hftstuttgart.buildingphysics.edit/icons/full/ctool16/CreateBuildingPhysicsCatalog_windowCatalog_WindowCatalog.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c44845289f5a85b4d51e35b2f9e3cf01cc887350
Binary files /dev/null and b/de.hftstuttgart.buildingphysics.edit/icons/full/ctool16/CreateBuildingPhysicsCatalog_windowCatalog_WindowCatalog.gif differ
diff --git a/de.hftstuttgart.buildingphysics.edit/icons/full/ctool16/CreateMaterialCatalog_materialCategories_MaterialCategory.gif b/de.hftstuttgart.buildingphysics.edit/icons/full/ctool16/CreateMaterialCatalog_materialCategories_MaterialCategory.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a86f915621e91e5b6f06802c154440ec6dd35f06
Binary files /dev/null and b/de.hftstuttgart.buildingphysics.edit/icons/full/ctool16/CreateMaterialCatalog_materialCategories_MaterialCategory.gif differ
diff --git a/de.hftstuttgart.buildingphysics.edit/icons/full/ctool16/CreateMaterialCategory_material_Material.gif b/de.hftstuttgart.buildingphysics.edit/icons/full/ctool16/CreateMaterialCategory_material_Material.gif
new file mode 100644
index 0000000000000000000000000000000000000000..fa814dc54f94538e7dee3fa25f403e92350ecd41
Binary files /dev/null and b/de.hftstuttgart.buildingphysics.edit/icons/full/ctool16/CreateMaterialCategory_material_Material.gif differ
diff --git a/de.hftstuttgart.buildingphysics.edit/icons/full/ctool16/CreateWindowCatalog_windowTypes_WindowType.gif b/de.hftstuttgart.buildingphysics.edit/icons/full/ctool16/CreateWindowCatalog_windowTypes_WindowType.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ab758ea0165e123e74919870f2739fe7ce918a9e
Binary files /dev/null and b/de.hftstuttgart.buildingphysics.edit/icons/full/ctool16/CreateWindowCatalog_windowTypes_WindowType.gif differ
diff --git a/de.hftstuttgart.buildingphysics.edit/plugin.properties b/de.hftstuttgart.buildingphysics.edit/plugin.properties
index 1dbf52b9fe4bcd9448d553a192fc33caf1e5451b..bac858c20301563217604243f67e2633d8cd5b6c 100644
--- a/de.hftstuttgart.buildingphysics.edit/plugin.properties
+++ b/de.hftstuttgart.buildingphysics.edit/plugin.properties
@@ -46,3 +46,4 @@ _UI_Material_heatCapacity_feature = Heat Capacity
_UI_Material_conductivity_feature = Conductivity
_UI_Unknown_feature = Unspecified
+_UI_Catalog_xxx_feature = Xxx
diff --git a/de.hftstuttgart.buildingphysics.edit/src-gen/de/hftstuttgart/buildingphysics/provider/BuildingPhysicsCatalogItemProvider.java b/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/BuildingPhysicsCatalogItemProvider.java
similarity index 100%
rename from de.hftstuttgart.buildingphysics.edit/src-gen/de/hftstuttgart/buildingphysics/provider/BuildingPhysicsCatalogItemProvider.java
rename to de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/BuildingPhysicsCatalogItemProvider.java
diff --git a/de.hftstuttgart.buildingphysics.edit/src-gen/de/hftstuttgart/buildingphysics/provider/BuildingPhysicsEditPlugin.java b/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/BuildingPhysicsEditPlugin.java
similarity index 100%
rename from de.hftstuttgart.buildingphysics.edit/src-gen/de/hftstuttgart/buildingphysics/provider/BuildingPhysicsEditPlugin.java
rename to de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/BuildingPhysicsEditPlugin.java
diff --git a/de.hftstuttgart.buildingphysics.edit/src-gen/de/hftstuttgart/buildingphysics/provider/BuildingPhysicsItemProviderAdapterFactory.java b/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/BuildingPhysicsItemProviderAdapterFactory.java
similarity index 99%
rename from de.hftstuttgart.buildingphysics.edit/src-gen/de/hftstuttgart/buildingphysics/provider/BuildingPhysicsItemProviderAdapterFactory.java
rename to de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/BuildingPhysicsItemProviderAdapterFactory.java
index 92350c0b0a5478ad3da4658b16bc421a27210988..757bc7f17fea6af387ed21d7a6cdc8e6635c9db3 100644
--- a/de.hftstuttgart.buildingphysics.edit/src-gen/de/hftstuttgart/buildingphysics/provider/BuildingPhysicsItemProviderAdapterFactory.java
+++ b/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/BuildingPhysicsItemProviderAdapterFactory.java
@@ -216,6 +216,7 @@ public class BuildingPhysicsItemProviderAdapterFactory extends BuildingPhysicsAd
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public ComposeableAdapterFactory getRootAdapterFactory() {
return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
}
@@ -226,6 +227,7 @@ public class BuildingPhysicsItemProviderAdapterFactory extends BuildingPhysicsAd
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
this.parentAdapterFactory = parentAdapterFactory;
}
@@ -274,6 +276,7 @@ public class BuildingPhysicsItemProviderAdapterFactory extends BuildingPhysicsAd
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public void addListener(INotifyChangedListener notifyChangedListener) {
changeNotifier.addListener(notifyChangedListener);
}
@@ -284,6 +287,7 @@ public class BuildingPhysicsItemProviderAdapterFactory extends BuildingPhysicsAd
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public void removeListener(INotifyChangedListener notifyChangedListener) {
changeNotifier.removeListener(notifyChangedListener);
}
@@ -294,6 +298,7 @@ public class BuildingPhysicsItemProviderAdapterFactory extends BuildingPhysicsAd
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public void fireNotifyChanged(Notification notification) {
changeNotifier.fireNotifyChanged(notification);
@@ -308,6 +313,7 @@ public class BuildingPhysicsItemProviderAdapterFactory extends BuildingPhysicsAd
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public void dispose() {
if (buildingPhysicsCatalogItemProvider != null)
buildingPhysicsCatalogItemProvider.dispose();
diff --git a/de.hftstuttgart.buildingphysics.edit/src-gen/de/hftstuttgart/buildingphysics/provider/CatalogItemProvider.java b/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/CatalogItemProvider.java
similarity index 100%
rename from de.hftstuttgart.buildingphysics.edit/src-gen/de/hftstuttgart/buildingphysics/provider/CatalogItemProvider.java
rename to de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/CatalogItemProvider.java
diff --git a/de.hftstuttgart.buildingphysics.edit/src-gen/de/hftstuttgart/buildingphysics/provider/MaterialCatalogItemProvider.java b/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/MaterialCatalogItemProvider.java
similarity index 100%
rename from de.hftstuttgart.buildingphysics.edit/src-gen/de/hftstuttgart/buildingphysics/provider/MaterialCatalogItemProvider.java
rename to de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/MaterialCatalogItemProvider.java
diff --git a/de.hftstuttgart.buildingphysics.edit/src-gen/de/hftstuttgart/buildingphysics/provider/MaterialCategoryItemProvider.java b/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/MaterialCategoryItemProvider.java
similarity index 100%
rename from de.hftstuttgart.buildingphysics.edit/src-gen/de/hftstuttgart/buildingphysics/provider/MaterialCategoryItemProvider.java
rename to de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/MaterialCategoryItemProvider.java
diff --git a/de.hftstuttgart.buildingphysics.edit/src-gen/de/hftstuttgart/buildingphysics/provider/MaterialItemProvider.java b/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/MaterialItemProvider.java
similarity index 100%
rename from de.hftstuttgart.buildingphysics.edit/src-gen/de/hftstuttgart/buildingphysics/provider/MaterialItemProvider.java
rename to de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/MaterialItemProvider.java
diff --git a/de.hftstuttgart.buildingphysics.edit/src-gen/de/hftstuttgart/buildingphysics/provider/WindowCatalogItemProvider.java b/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/WindowCatalogItemProvider.java
similarity index 100%
rename from de.hftstuttgart.buildingphysics.edit/src-gen/de/hftstuttgart/buildingphysics/provider/WindowCatalogItemProvider.java
rename to de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/WindowCatalogItemProvider.java
diff --git a/de.hftstuttgart.buildingphysics.edit/src-gen/de/hftstuttgart/buildingphysics/provider/WindowTypeItemProvider.java b/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/WindowTypeItemProvider.java
similarity index 100%
rename from de.hftstuttgart.buildingphysics.edit/src-gen/de/hftstuttgart/buildingphysics/provider/WindowTypeItemProvider.java
rename to de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/WindowTypeItemProvider.java
diff --git a/de.hftstuttgart.buildingphysics.parent/pom.xml b/de.hftstuttgart.buildingphysics.parent/pom.xml
index effb80a1a1ce884ae770c3e6995c653759384368..4dfe9c070771e3fb54fe991798cbc8a725d35b98 100644
--- a/de.hftstuttgart.buildingphysics.parent/pom.xml
+++ b/de.hftstuttgart.buildingphysics.parent/pom.xml
@@ -9,7 +9,7 @@
<name>Building Physics Catalog Parent POM</name>
<properties>
- <tycho-version>2.1.0</tycho-version>
+ <tycho-version>2.2.0</tycho-version>
</properties>
<build>
@@ -31,7 +31,7 @@
<artifactId>target-platform-configuration</artifactId>
<version>${tycho-version}</version>
<configuration>
- <executionEnvironment>JavaSE-15</executionEnvironment>
+ <executionEnvironment>JavaSE-15</executionEnvironment>
<target>
<artifact>
<groupId>de.hftstuttgart</groupId>
@@ -44,7 +44,7 @@
<os>linux</os>
<ws>gtk</ws>
<arch>x86</arch>
- </environment -->
+ </environment >
<environment>
<os>linux</os>
<ws>gtk</ws>
@@ -54,7 +54,7 @@
<os>win32</os>
<ws>win32</ws>
<arch>x86_64</arch>
- </environment>
+ </environment -->
<environment>
<os>macosx</os>
<ws>cocoa</ws>
diff --git a/de.hftstuttgart.buildingphysics.product/de.hftstuttgart.buildingphysics.application.product b/de.hftstuttgart.buildingphysics.product/de.hftstuttgart.buildingphysics.application.product
index 4caa7aa76fc9f012cff98e5a00ee2f823e1eaa5f..02a60489a2870d21d24be7c6a00ef102603e6023 100644
--- a/de.hftstuttgart.buildingphysics.product/de.hftstuttgart.buildingphysics.application.product
+++ b/de.hftstuttgart.buildingphysics.product/de.hftstuttgart.buildingphysics.application.product
@@ -31,15 +31,13 @@
</plugins>
<features>
- <feature id="org.eclipse.e4.rcp" installMode="root"/>
<feature id="de.hftstuttgart.buildingphysics.feature"/>
- <feature id="org.eclipse.emf.ecore" installMode="root"/>
- <feature id="org.eclipse.emf.common" installMode="root"/>
<feature id="org.eclipse.emf.ecp.viewmodel.feature" installMode="root"/>
<feature id="org.eclipse.emf.ecp.view.categorization.feature" installMode="root"/>
<feature id="org.eclipse.emf.ecp.view.group.feature" installMode="root"/>
<feature id="org.eclipse.emf.ecp.view.label.feature" installMode="root"/>
<feature id="org.eclipse.emf.ecp.view.table.feature" installMode="root"/>
+ <feature id="org.eclipse.equinox.sdk" installMode="root"/>
</features>
<configurations>
diff --git a/de.hftstuttgart.buildingphysics.target/buildingphysics.target.target b/de.hftstuttgart.buildingphysics.target/buildingphysics.target.target
index 150d373829785c7462cfdb730630b9ed1ddee305..b6ef3955cc9ef4a3409d1ce0502bd48f4f1f87d4 100644
--- a/de.hftstuttgart.buildingphysics.target/buildingphysics.target.target
+++ b/de.hftstuttgart.buildingphysics.target/buildingphysics.target.target
@@ -1,15 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
-<target name="RCP, EMF Forms 2020-09">
+<target name="RCP, EMF Forms 2020-12">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
- <repository location="http://download.eclipse.org/releases/2020-09"/>
- <unit id="org.eclipse.equinox.sdk.feature.group" version="3.20.300.v20200828-1034"/>
- <unit id="org.eclipse.e4.rcp.feature.group" version="4.17.0.v20200831-1002"/>
+ <repository location="http://download.eclipse.org/releases/2020-12"/>
+ <unit id="org.eclipse.equinox.sdk.feature.group" version="3.21.0.v20201128-0731"/>
+ <unit id="org.eclipse.e4.core.tools.feature.source.feature.group" version="4.18.0.v20201026-0947"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
<repository location="http://download.eclipse.org/ecp/releases/releases_target_125/"/>
<unit id="org.eclipse.emf.ecp.emfforms.sdk.feature.feature.group" version="1.25.0.20200916-0800"/>
</location>
+ <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
+ <repository location="https://transfer.hft-stuttgart.de/pages/neqmodplus/indriya-p2/release_target_211/"/>
+ <unit id="de.hft-stuttgart.indriya.feature.feature.group" version="0.0.0"/>
+ </location>
+ <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
+ <repository location="https://transfer.hft-stuttgart.de/pages/neqmodplus/de.hft-stuttgart.cityunits/release_target_100/"/>
+ <unit id="de.hftstuttgart.cityunits.feature.feature.group" version="0.0.0"/>
+ </location>
</locations>
</target>
\ No newline at end of file
diff --git a/de.hftstuttgart.buildingphysics.viewmodel/META-INF/MANIFEST.MF b/de.hftstuttgart.buildingphysics.viewmodel/META-INF/MANIFEST.MF
index 379f0afbacc8a453ec4606307901bbe10a9453ef..8652fa0359b135fa1d67cbd886492e836ec76336 100644
--- a/de.hftstuttgart.buildingphysics.viewmodel/META-INF/MANIFEST.MF
+++ b/de.hftstuttgart.buildingphysics.viewmodel/META-INF/MANIFEST.MF
@@ -3,4 +3,6 @@ Bundle-ManifestVersion: 2
Bundle-Name: de.hftstuttgart.buildingphysics.viewmodel
Bundle-SymbolicName: de.hftstuttgart.buildingphysics.viewmodel;singleton:=true
Bundle-Version: 1.0.0.qualifier
-Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi
+Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi,
+ de.hftstuttgart.cityunits.ui.renderer;bundle-version="1.0.0",
+ de.hftstuttgart.cityunits.model;bundle-version="1.0.0"
diff --git a/de.hftstuttgart.buildingphysics/.classpath b/de.hftstuttgart.buildingphysics/.classpath
index 48cc6cafee283f78d2be10cb4a8eb6f884b111c4..1f0469022c306ea5fefe4b29b6d0eee95d3db009 100644
--- a/de.hftstuttgart.buildingphysics/.classpath
+++ b/de.hftstuttgart.buildingphysics/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src-gen/"/>
+ <classpathentry kind="src" path="src/"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/de.hftstuttgart.buildingphysics/META-INF/MANIFEST.MF b/de.hftstuttgart.buildingphysics/META-INF/MANIFEST.MF
index 648a71f92bd5fd587a43bda4607c7fec66051d40..769f5e32521f73dd0d9a308e8d519be21f917005 100644
--- a/de.hftstuttgart.buildingphysics/META-INF/MANIFEST.MF
+++ b/de.hftstuttgart.buildingphysics/META-INF/MANIFEST.MF
@@ -7,10 +7,10 @@ Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: de.hftstuttgart.buildingphysics,
de.hftstuttgart.buildingphysics.impl,
de.hftstuttgart.buildingphysics.util
Require-Bundle: org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.core.runtime
+ org.eclipse.core.runtime,
+ de.hftstuttgart.cityunits.model;bundle-version="1.0.0";visibility:=reexport
Bundle-ActivationPolicy: lazy
diff --git a/de.hftstuttgart.buildingphysics/build.properties b/de.hftstuttgart.buildingphysics/build.properties
index 697ca964527a545764d3a69847c122b371257973..dbc638fbc52e4f53fb2cda0e8ef44a95760ab98f 100644
--- a/de.hftstuttgart.buildingphysics/build.properties
+++ b/de.hftstuttgart.buildingphysics/build.properties
@@ -6,5 +6,4 @@ bin.includes = .,\
plugin.xml,\
plugin.properties
jars.compile.order = .
-source.. = src-gen/
-output.. = bin/
+source.. = src/
diff --git a/de.hftstuttgart.buildingphysics/model/buildingphysics.genmodel b/de.hftstuttgart.buildingphysics/model/buildingphysics.genmodel
index c6436fa2bb6a2b6ba5f56d4400339d5393d4d5e3..7350dfb803fe291cedc7d7998880f4e6daaf09ed 100644
--- a/de.hftstuttgart.buildingphysics/model/buildingphysics.genmodel
+++ b/de.hftstuttgart.buildingphysics/model/buildingphysics.genmodel
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<genmodel:GenModel 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:genmodel="http://www.eclipse.org/emf/2002/GenModel"
- modelDirectory="/de.hftstuttgart.buildingphysics/src-gen" creationIcons="false"
- editDirectory="/de.hftstuttgart.buildingphysics.edit/src-gen" editorDirectory="/de.hftstuttgart.buildingphysics.editor/src-gen"
+ modelDirectory="/de.hftstuttgart.buildingphysics/src" creationIcons="false"
+ editDirectory="/de.hftstuttgart.buildingphysics.edit/src" editorDirectory="/de.hftstuttgart.buildingphysics.editor/src"
modelPluginID="de.hftstuttgart.buildingphysics" modelName="BuildingPhysics" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
- codeFormatting="true" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"
+ codeFormatting="true" importerID="org.eclipse.emf.importer.ecore" complianceLevel="15.0"
copyrightFields="false" operationReflection="true" importOrganizing="true">
<foreignModel>buildingphysics.ecore</foreignModel>
<testsDirectory xsi:nil="true"/>
diff --git a/de.hftstuttgart.buildingphysics/src-gen/de/hftstuttgart/buildingphysics/BuildingPhysicsCatalog.java b/de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/BuildingPhysicsCatalog.java
similarity index 100%
rename from de.hftstuttgart.buildingphysics/src-gen/de/hftstuttgart/buildingphysics/BuildingPhysicsCatalog.java
rename to de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/BuildingPhysicsCatalog.java
diff --git a/de.hftstuttgart.buildingphysics/src-gen/de/hftstuttgart/buildingphysics/BuildingPhysicsFactory.java b/de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/BuildingPhysicsFactory.java
similarity index 100%
rename from de.hftstuttgart.buildingphysics/src-gen/de/hftstuttgart/buildingphysics/BuildingPhysicsFactory.java
rename to de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/BuildingPhysicsFactory.java
diff --git a/de.hftstuttgart.buildingphysics/src-gen/de/hftstuttgart/buildingphysics/BuildingPhysicsPackage.java b/de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/BuildingPhysicsPackage.java
similarity index 100%
rename from de.hftstuttgart.buildingphysics/src-gen/de/hftstuttgart/buildingphysics/BuildingPhysicsPackage.java
rename to de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/BuildingPhysicsPackage.java
diff --git a/de.hftstuttgart.buildingphysics/src-gen/de/hftstuttgart/buildingphysics/Catalog.java b/de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/Catalog.java
similarity index 100%
rename from de.hftstuttgart.buildingphysics/src-gen/de/hftstuttgart/buildingphysics/Catalog.java
rename to de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/Catalog.java
diff --git a/de.hftstuttgart.buildingphysics/src-gen/de/hftstuttgart/buildingphysics/Material.java b/de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/Material.java
similarity index 100%
rename from de.hftstuttgart.buildingphysics/src-gen/de/hftstuttgart/buildingphysics/Material.java
rename to de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/Material.java
diff --git a/de.hftstuttgart.buildingphysics/src-gen/de/hftstuttgart/buildingphysics/MaterialCatalog.java b/de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/MaterialCatalog.java
similarity index 100%
rename from de.hftstuttgart.buildingphysics/src-gen/de/hftstuttgart/buildingphysics/MaterialCatalog.java
rename to de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/MaterialCatalog.java
diff --git a/de.hftstuttgart.buildingphysics/src-gen/de/hftstuttgart/buildingphysics/MaterialCategory.java b/de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/MaterialCategory.java
similarity index 100%
rename from de.hftstuttgart.buildingphysics/src-gen/de/hftstuttgart/buildingphysics/MaterialCategory.java
rename to de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/MaterialCategory.java
diff --git a/de.hftstuttgart.buildingphysics/src-gen/de/hftstuttgart/buildingphysics/WindowCatalog.java b/de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/WindowCatalog.java
similarity index 100%
rename from de.hftstuttgart.buildingphysics/src-gen/de/hftstuttgart/buildingphysics/WindowCatalog.java
rename to de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/WindowCatalog.java
diff --git a/de.hftstuttgart.buildingphysics/src-gen/de/hftstuttgart/buildingphysics/WindowType.java b/de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/WindowType.java
similarity index 100%
rename from de.hftstuttgart.buildingphysics/src-gen/de/hftstuttgart/buildingphysics/WindowType.java
rename to de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/WindowType.java
index 8e5f3c4212735602998fdd069e22df86ae8c752c..10c4c38278727607243bb4c8c26fe228e17ad560 100644
--- a/de.hftstuttgart.buildingphysics/src-gen/de/hftstuttgart/buildingphysics/WindowType.java
+++ b/de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/WindowType.java
@@ -26,7 +26,6 @@ import org.eclipse.emf.ecore.EObject;
* @generated
*/
public interface WindowType extends EObject {
-
/**
* Returns the value of the '<em><b>Id</b></em>' attribute.
* <!-- begin-user-doc -->
@@ -161,4 +160,5 @@ public interface WindowType extends EObject {
* @generated
*/
void setFrameRatio(int value);
+
} // WindowType
diff --git a/de.hftstuttgart.buildingphysics/src-gen/de/hftstuttgart/buildingphysics/impl/BuildingPhysicsCatalogImpl.java b/de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/BuildingPhysicsCatalogImpl.java
similarity index 99%
rename from de.hftstuttgart.buildingphysics/src-gen/de/hftstuttgart/buildingphysics/impl/BuildingPhysicsCatalogImpl.java
rename to de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/BuildingPhysicsCatalogImpl.java
index 2020825cfc456ac301a36a9bbe07100a13cf3a1b..6b668aa9bca795594f7578453c50a7fbe78d36b4 100644
--- a/de.hftstuttgart.buildingphysics/src-gen/de/hftstuttgart/buildingphysics/impl/BuildingPhysicsCatalogImpl.java
+++ b/de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/BuildingPhysicsCatalogImpl.java
@@ -6,8 +6,10 @@ import de.hftstuttgart.buildingphysics.BuildingPhysicsCatalog;
import de.hftstuttgart.buildingphysics.BuildingPhysicsPackage;
import de.hftstuttgart.buildingphysics.MaterialCatalog;
import de.hftstuttgart.buildingphysics.WindowCatalog;
+
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
+
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
@@ -94,6 +96,7 @@ public class BuildingPhysicsCatalogImpl extends MinimalEObjectImpl.Container imp
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public String getAuthor() {
return author;
}
@@ -103,6 +106,7 @@ public class BuildingPhysicsCatalogImpl extends MinimalEObjectImpl.Container imp
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public void setAuthor(String newAuthor) {
String oldAuthor = author;
author = newAuthor;
@@ -116,6 +120,7 @@ public class BuildingPhysicsCatalogImpl extends MinimalEObjectImpl.Container imp
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public WindowCatalog getWindowCatalog() {
return windowCatalog;
}
@@ -145,6 +150,7 @@ public class BuildingPhysicsCatalogImpl extends MinimalEObjectImpl.Container imp
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public void setWindowCatalog(WindowCatalog newWindowCatalog) {
if (newWindowCatalog != windowCatalog) {
NotificationChain msgs = null;
@@ -170,6 +176,7 @@ public class BuildingPhysicsCatalogImpl extends MinimalEObjectImpl.Container imp
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public MaterialCatalog getMaterialCatalog() {
return materialCatalog;
}
@@ -199,6 +206,7 @@ public class BuildingPhysicsCatalogImpl extends MinimalEObjectImpl.Container imp
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public void setMaterialCatalog(MaterialCatalog newMaterialCatalog) {
if (newMaterialCatalog != materialCatalog) {
NotificationChain msgs = null;
@@ -258,7 +266,6 @@ public class BuildingPhysicsCatalogImpl extends MinimalEObjectImpl.Container imp
* <!-- end-user-doc -->
* @generated
*/
- @SuppressWarnings("unchecked")
@Override
public void eSet(int featureID, Object newValue) {
switch (featureID) {
diff --git a/de.hftstuttgart.buildingphysics/src-gen/de/hftstuttgart/buildingphysics/impl/BuildingPhysicsFactoryImpl.java b/de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/BuildingPhysicsFactoryImpl.java
similarity index 98%
rename from de.hftstuttgart.buildingphysics/src-gen/de/hftstuttgart/buildingphysics/impl/BuildingPhysicsFactoryImpl.java
rename to de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/BuildingPhysicsFactoryImpl.java
index 0ba994bb5032bf0375f6a07e86f07afc2037f69c..51f21ce400f57fc7749a02d79ef40d67241ca284 100644
--- a/de.hftstuttgart.buildingphysics/src-gen/de/hftstuttgart/buildingphysics/impl/BuildingPhysicsFactoryImpl.java
+++ b/de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/BuildingPhysicsFactoryImpl.java
@@ -78,6 +78,7 @@ public class BuildingPhysicsFactoryImpl extends EFactoryImpl implements Building
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public BuildingPhysicsCatalog createBuildingPhysicsCatalog() {
BuildingPhysicsCatalogImpl buildingPhysicsCatalog = new BuildingPhysicsCatalogImpl();
return buildingPhysicsCatalog;
@@ -88,6 +89,7 @@ public class BuildingPhysicsFactoryImpl extends EFactoryImpl implements Building
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public WindowType createWindowType() {
WindowTypeImpl windowType = new WindowTypeImpl();
return windowType;
@@ -98,6 +100,7 @@ public class BuildingPhysicsFactoryImpl extends EFactoryImpl implements Building
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public WindowCatalog createWindowCatalog() {
WindowCatalogImpl windowCatalog = new WindowCatalogImpl();
return windowCatalog;
@@ -108,6 +111,7 @@ public class BuildingPhysicsFactoryImpl extends EFactoryImpl implements Building
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public MaterialCatalog createMaterialCatalog() {
MaterialCatalogImpl materialCatalog = new MaterialCatalogImpl();
return materialCatalog;
@@ -118,6 +122,7 @@ public class BuildingPhysicsFactoryImpl extends EFactoryImpl implements Building
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public MaterialCategory createMaterialCategory() {
MaterialCategoryImpl materialCategory = new MaterialCategoryImpl();
return materialCategory;
@@ -128,6 +133,7 @@ public class BuildingPhysicsFactoryImpl extends EFactoryImpl implements Building
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public Material createMaterial() {
MaterialImpl material = new MaterialImpl();
return material;
@@ -138,6 +144,7 @@ public class BuildingPhysicsFactoryImpl extends EFactoryImpl implements Building
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public BuildingPhysicsPackage getBuildingPhysicsPackage() {
return (BuildingPhysicsPackage) getEPackage();
}
diff --git a/de.hftstuttgart.buildingphysics/src-gen/de/hftstuttgart/buildingphysics/impl/BuildingPhysicsPackageImpl.java b/de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/BuildingPhysicsPackageImpl.java
similarity index 98%
rename from de.hftstuttgart.buildingphysics/src-gen/de/hftstuttgart/buildingphysics/impl/BuildingPhysicsPackageImpl.java
rename to de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/BuildingPhysicsPackageImpl.java
index 78323e25b8baa9b5bf4c3367f1f24cc509c94cfd..ba3dd51b4a2a926bacfa3a7ec34d839b98f77e7a 100644
--- a/de.hftstuttgart.buildingphysics/src-gen/de/hftstuttgart/buildingphysics/impl/BuildingPhysicsPackageImpl.java
+++ b/de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/BuildingPhysicsPackageImpl.java
@@ -144,6 +144,7 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EClass getBuildingPhysicsCatalog() {
return buildingPhysicsCatalogEClass;
}
@@ -153,6 +154,7 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EAttribute getBuildingPhysicsCatalog_Author() {
return (EAttribute) buildingPhysicsCatalogEClass.getEStructuralFeatures().get(0);
}
@@ -162,6 +164,7 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EReference getBuildingPhysicsCatalog_WindowCatalog() {
return (EReference) buildingPhysicsCatalogEClass.getEStructuralFeatures().get(1);
}
@@ -171,6 +174,7 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EReference getBuildingPhysicsCatalog_MaterialCatalog() {
return (EReference) buildingPhysicsCatalogEClass.getEStructuralFeatures().get(2);
}
@@ -180,6 +184,7 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EClass getWindowType() {
return windowTypeEClass;
}
@@ -189,6 +194,7 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EAttribute getWindowType_Id() {
return (EAttribute) windowTypeEClass.getEStructuralFeatures().get(0);
}
@@ -198,6 +204,7 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EAttribute getWindowType_Name() {
return (EAttribute) windowTypeEClass.getEStructuralFeatures().get(1);
}
@@ -207,6 +214,7 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EAttribute getWindowType_UValue() {
return (EAttribute) windowTypeEClass.getEStructuralFeatures().get(2);
}
@@ -216,6 +224,7 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EAttribute getWindowType_GValue() {
return (EAttribute) windowTypeEClass.getEStructuralFeatures().get(3);
}
@@ -225,6 +234,7 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EAttribute getWindowType_GlazingNumber() {
return (EAttribute) windowTypeEClass.getEStructuralFeatures().get(4);
}
@@ -234,6 +244,7 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EAttribute getWindowType_FrameRatio() {
return (EAttribute) windowTypeEClass.getEStructuralFeatures().get(5);
}
@@ -243,6 +254,7 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EClass getCatalog() {
return catalogEClass;
}
@@ -252,6 +264,7 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EAttribute getCatalog_Name() {
return (EAttribute) catalogEClass.getEStructuralFeatures().get(0);
}
@@ -261,6 +274,7 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EAttribute getCatalog_Description() {
return (EAttribute) catalogEClass.getEStructuralFeatures().get(1);
}
@@ -270,6 +284,7 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EAttribute getCatalog_Source() {
return (EAttribute) catalogEClass.getEStructuralFeatures().get(2);
}
@@ -279,6 +294,7 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EClass getWindowCatalog() {
return windowCatalogEClass;
}
@@ -288,6 +304,7 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EReference getWindowCatalog_WindowTypes() {
return (EReference) windowCatalogEClass.getEStructuralFeatures().get(0);
}
@@ -297,6 +314,7 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EClass getMaterialCatalog() {
return materialCatalogEClass;
}
@@ -306,6 +324,7 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EReference getMaterialCatalog_MaterialCategories() {
return (EReference) materialCatalogEClass.getEStructuralFeatures().get(0);
}
@@ -315,6 +334,7 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EClass getMaterialCategory() {
return materialCategoryEClass;
}
@@ -324,6 +344,7 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EReference getMaterialCategory_Material() {
return (EReference) materialCategoryEClass.getEStructuralFeatures().get(0);
}
@@ -333,6 +354,7 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EAttribute getMaterialCategory_Name() {
return (EAttribute) materialCategoryEClass.getEStructuralFeatures().get(1);
}
@@ -342,6 +364,7 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EClass getMaterial() {
return materialEClass;
}
@@ -351,6 +374,7 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EAttribute getMaterial_Id() {
return (EAttribute) materialEClass.getEStructuralFeatures().get(0);
}
@@ -360,6 +384,7 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EAttribute getMaterial_Name() {
return (EAttribute) materialEClass.getEStructuralFeatures().get(1);
}
@@ -369,6 +394,7 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EAttribute getMaterial_Density() {
return (EAttribute) materialEClass.getEStructuralFeatures().get(2);
}
@@ -378,6 +404,7 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EAttribute getMaterial_HeatCapacity() {
return (EAttribute) materialEClass.getEStructuralFeatures().get(3);
}
@@ -387,6 +414,7 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EAttribute getMaterial_Conductivity() {
return (EAttribute) materialEClass.getEStructuralFeatures().get(4);
}
@@ -396,6 +424,7 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public BuildingPhysicsFactory getBuildingPhysicsFactory() {
return (BuildingPhysicsFactory) getEFactoryInstance();
}
diff --git a/de.hftstuttgart.buildingphysics/src-gen/de/hftstuttgart/buildingphysics/impl/CatalogImpl.java b/de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/CatalogImpl.java
similarity index 99%
rename from de.hftstuttgart.buildingphysics/src-gen/de/hftstuttgart/buildingphysics/impl/CatalogImpl.java
rename to de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/CatalogImpl.java
index c045fd67392fe90a86a2646d0ae84c143574afee..87c110575574fb19ba31005eaf6f0fcb3a8f140a 100644
--- a/de.hftstuttgart.buildingphysics/src-gen/de/hftstuttgart/buildingphysics/impl/CatalogImpl.java
+++ b/de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/CatalogImpl.java
@@ -112,6 +112,7 @@ public abstract class CatalogImpl extends MinimalEObjectImpl.Container implement
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public String getName() {
return name;
}
@@ -121,6 +122,7 @@ public abstract class CatalogImpl extends MinimalEObjectImpl.Container implement
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public void setName(String newName) {
String oldName = name;
name = newName;
@@ -133,6 +135,7 @@ public abstract class CatalogImpl extends MinimalEObjectImpl.Container implement
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public String getDescription() {
return description;
}
@@ -142,6 +145,7 @@ public abstract class CatalogImpl extends MinimalEObjectImpl.Container implement
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public void setDescription(String newDescription) {
String oldDescription = description;
description = newDescription;
@@ -155,6 +159,7 @@ public abstract class CatalogImpl extends MinimalEObjectImpl.Container implement
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public String getSource() {
return source;
}
@@ -164,6 +169,7 @@ public abstract class CatalogImpl extends MinimalEObjectImpl.Container implement
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public void setSource(String newSource) {
String oldSource = source;
source = newSource;
diff --git a/de.hftstuttgart.buildingphysics/src-gen/de/hftstuttgart/buildingphysics/impl/MaterialCatalogImpl.java b/de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/MaterialCatalogImpl.java
similarity index 99%
rename from de.hftstuttgart.buildingphysics/src-gen/de/hftstuttgart/buildingphysics/impl/MaterialCatalogImpl.java
rename to de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/MaterialCatalogImpl.java
index 2690911a1f3c909b84af962140db8a5db77a9cf4..d5bda35269258df4c12a2de45e8ee65a2e86491a 100644
--- a/de.hftstuttgart.buildingphysics/src-gen/de/hftstuttgart/buildingphysics/impl/MaterialCatalogImpl.java
+++ b/de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/MaterialCatalogImpl.java
@@ -66,6 +66,7 @@ public class MaterialCatalogImpl extends CatalogImpl implements MaterialCatalog
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EList<MaterialCategory> getMaterialCategories() {
if (materialCategories == null) {
materialCategories = new EObjectContainmentEList<MaterialCategory>(MaterialCategory.class, this,
diff --git a/de.hftstuttgart.buildingphysics/src-gen/de/hftstuttgart/buildingphysics/impl/MaterialCategoryImpl.java b/de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/MaterialCategoryImpl.java
similarity index 99%
rename from de.hftstuttgart.buildingphysics/src-gen/de/hftstuttgart/buildingphysics/impl/MaterialCategoryImpl.java
rename to de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/MaterialCategoryImpl.java
index 17b716a29910bff2d1fd90565673e37b49ab0bf4..70d89cd7d3e62605f28ed81552e6adef273c316a 100644
--- a/de.hftstuttgart.buildingphysics/src-gen/de/hftstuttgart/buildingphysics/impl/MaterialCategoryImpl.java
+++ b/de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/MaterialCategoryImpl.java
@@ -91,6 +91,7 @@ public class MaterialCategoryImpl extends MinimalEObjectImpl.Container implement
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EList<Material> getMaterial() {
if (material == null) {
material = new EObjectContainmentEList<Material>(Material.class, this,
@@ -104,6 +105,7 @@ public class MaterialCategoryImpl extends MinimalEObjectImpl.Container implement
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public String getName() {
return name;
}
@@ -113,6 +115,7 @@ public class MaterialCategoryImpl extends MinimalEObjectImpl.Container implement
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public void setName(String newName) {
String oldName = name;
name = newName;
diff --git a/de.hftstuttgart.buildingphysics/src-gen/de/hftstuttgart/buildingphysics/impl/MaterialImpl.java b/de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/MaterialImpl.java
similarity index 98%
rename from de.hftstuttgart.buildingphysics/src-gen/de/hftstuttgart/buildingphysics/impl/MaterialImpl.java
rename to de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/MaterialImpl.java
index 7a310f35428834ecc7013f286d65750bb588e880..006386f56a0b19555b3ce662e81f446a967962b1 100644
--- a/de.hftstuttgart.buildingphysics/src-gen/de/hftstuttgart/buildingphysics/impl/MaterialImpl.java
+++ b/de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/MaterialImpl.java
@@ -154,6 +154,7 @@ public class MaterialImpl extends MinimalEObjectImpl.Container implements Materi
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public int getId() {
return id;
}
@@ -163,6 +164,7 @@ public class MaterialImpl extends MinimalEObjectImpl.Container implements Materi
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public void setId(int newId) {
int oldId = id;
id = newId;
@@ -175,6 +177,7 @@ public class MaterialImpl extends MinimalEObjectImpl.Container implements Materi
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public String getName() {
return name;
}
@@ -184,6 +187,7 @@ public class MaterialImpl extends MinimalEObjectImpl.Container implements Materi
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public void setName(String newName) {
String oldName = name;
name = newName;
@@ -197,6 +201,7 @@ public class MaterialImpl extends MinimalEObjectImpl.Container implements Materi
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public double getDensity() {
return density;
}
@@ -206,6 +211,7 @@ public class MaterialImpl extends MinimalEObjectImpl.Container implements Materi
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public void setDensity(double newDensity) {
double oldDensity = density;
density = newDensity;
@@ -219,6 +225,7 @@ public class MaterialImpl extends MinimalEObjectImpl.Container implements Materi
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public double getHeatCapacity() {
return heatCapacity;
}
@@ -228,6 +235,7 @@ public class MaterialImpl extends MinimalEObjectImpl.Container implements Materi
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public void setHeatCapacity(double newHeatCapacity) {
double oldHeatCapacity = heatCapacity;
heatCapacity = newHeatCapacity;
@@ -241,6 +249,7 @@ public class MaterialImpl extends MinimalEObjectImpl.Container implements Materi
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public double getConductivity() {
return conductivity;
}
@@ -250,6 +259,7 @@ public class MaterialImpl extends MinimalEObjectImpl.Container implements Materi
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public void setConductivity(double newConductivity) {
double oldConductivity = conductivity;
conductivity = newConductivity;
diff --git a/de.hftstuttgart.buildingphysics/src-gen/de/hftstuttgart/buildingphysics/impl/WindowCatalogImpl.java b/de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/WindowCatalogImpl.java
similarity index 99%
rename from de.hftstuttgart.buildingphysics/src-gen/de/hftstuttgart/buildingphysics/impl/WindowCatalogImpl.java
rename to de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/WindowCatalogImpl.java
index 66ae9bd057b94693beae6157423f9a31cafee83c..e0cc05976f106c4401f2d95c6ebd87ded56144b0 100644
--- a/de.hftstuttgart.buildingphysics/src-gen/de/hftstuttgart/buildingphysics/impl/WindowCatalogImpl.java
+++ b/de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/WindowCatalogImpl.java
@@ -66,6 +66,7 @@ public class WindowCatalogImpl extends CatalogImpl implements WindowCatalog {
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EList<WindowType> getWindowTypes() {
if (windowTypes == null) {
windowTypes = new EObjectContainmentEList<WindowType>(WindowType.class, this,
diff --git a/de.hftstuttgart.buildingphysics/src-gen/de/hftstuttgart/buildingphysics/impl/WindowTypeImpl.java b/de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/WindowTypeImpl.java
similarity index 98%
rename from de.hftstuttgart.buildingphysics/src-gen/de/hftstuttgart/buildingphysics/impl/WindowTypeImpl.java
rename to de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/WindowTypeImpl.java
index b496fb6fb0fc1c811e0c4a930c7d26930becd284..d3cf42d0182e2cde5072386789917ad44479350e 100644
--- a/de.hftstuttgart.buildingphysics/src-gen/de/hftstuttgart/buildingphysics/impl/WindowTypeImpl.java
+++ b/de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/WindowTypeImpl.java
@@ -6,6 +6,7 @@ import de.hftstuttgart.buildingphysics.BuildingPhysicsPackage;
import de.hftstuttgart.buildingphysics.WindowType;
import org.eclipse.emf.common.notify.Notification;
+
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
@@ -39,6 +40,7 @@ public class WindowTypeImpl extends MinimalEObjectImpl.Container implements Wind
* @ordered
*/
protected static final int ID_EDEFAULT = 0;
+
/**
* The cached value of the '{@link #getId() <em>Id</em>}' attribute.
* <!-- begin-user-doc -->
@@ -48,6 +50,7 @@ public class WindowTypeImpl extends MinimalEObjectImpl.Container implements Wind
* @ordered
*/
protected int id = ID_EDEFAULT;
+
/**
* The default value of the '{@link #getName() <em>Name</em>}' attribute.
* <!-- begin-user-doc -->
@@ -57,6 +60,7 @@ public class WindowTypeImpl extends MinimalEObjectImpl.Container implements Wind
* @ordered
*/
protected static final String NAME_EDEFAULT = null;
+
/**
* The cached value of the '{@link #getName() <em>Name</em>}' attribute.
* <!-- begin-user-doc -->
@@ -66,6 +70,7 @@ public class WindowTypeImpl extends MinimalEObjectImpl.Container implements Wind
* @ordered
*/
protected String name = NAME_EDEFAULT;
+
/**
* The default value of the '{@link #getUValue() <em>UValue</em>}' attribute.
* <!-- begin-user-doc -->
@@ -75,6 +80,7 @@ public class WindowTypeImpl extends MinimalEObjectImpl.Container implements Wind
* @ordered
*/
protected static final double UVALUE_EDEFAULT = 0.0;
+
/**
* The cached value of the '{@link #getUValue() <em>UValue</em>}' attribute.
* <!-- begin-user-doc -->
@@ -84,6 +90,7 @@ public class WindowTypeImpl extends MinimalEObjectImpl.Container implements Wind
* @ordered
*/
protected double uValue = UVALUE_EDEFAULT;
+
/**
* The default value of the '{@link #getGValue() <em>GValue</em>}' attribute.
* <!-- begin-user-doc -->
@@ -93,6 +100,7 @@ public class WindowTypeImpl extends MinimalEObjectImpl.Container implements Wind
* @ordered
*/
protected static final double GVALUE_EDEFAULT = 0.0;
+
/**
* The cached value of the '{@link #getGValue() <em>GValue</em>}' attribute.
* <!-- begin-user-doc -->
@@ -102,6 +110,7 @@ public class WindowTypeImpl extends MinimalEObjectImpl.Container implements Wind
* @ordered
*/
protected double gValue = GVALUE_EDEFAULT;
+
/**
* The default value of the '{@link #getGlazingNumber() <em>Glazing Number</em>}' attribute.
* <!-- begin-user-doc -->
@@ -111,6 +120,7 @@ public class WindowTypeImpl extends MinimalEObjectImpl.Container implements Wind
* @ordered
*/
protected static final int GLAZING_NUMBER_EDEFAULT = 0;
+
/**
* The cached value of the '{@link #getGlazingNumber() <em>Glazing Number</em>}' attribute.
* <!-- begin-user-doc -->
@@ -120,6 +130,7 @@ public class WindowTypeImpl extends MinimalEObjectImpl.Container implements Wind
* @ordered
*/
protected int glazingNumber = GLAZING_NUMBER_EDEFAULT;
+
/**
* The default value of the '{@link #getFrameRatio() <em>Frame Ratio</em>}' attribute.
* <!-- begin-user-doc -->
@@ -129,6 +140,7 @@ public class WindowTypeImpl extends MinimalEObjectImpl.Container implements Wind
* @ordered
*/
protected static final int FRAME_RATIO_EDEFAULT = 0;
+
/**
* The cached value of the '{@link #getFrameRatio() <em>Frame Ratio</em>}' attribute.
* <!-- begin-user-doc -->
@@ -163,6 +175,7 @@ public class WindowTypeImpl extends MinimalEObjectImpl.Container implements Wind
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public int getId() {
return id;
}
@@ -172,6 +185,7 @@ public class WindowTypeImpl extends MinimalEObjectImpl.Container implements Wind
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public void setId(int newId) {
int oldId = id;
id = newId;
@@ -184,6 +198,7 @@ public class WindowTypeImpl extends MinimalEObjectImpl.Container implements Wind
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public String getName() {
return name;
}
@@ -193,6 +208,7 @@ public class WindowTypeImpl extends MinimalEObjectImpl.Container implements Wind
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public void setName(String newName) {
String oldName = name;
name = newName;
@@ -206,6 +222,7 @@ public class WindowTypeImpl extends MinimalEObjectImpl.Container implements Wind
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public double getUValue() {
return uValue;
}
@@ -215,6 +232,7 @@ public class WindowTypeImpl extends MinimalEObjectImpl.Container implements Wind
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public void setUValue(double newUValue) {
double oldUValue = uValue;
uValue = newUValue;
@@ -228,6 +246,7 @@ public class WindowTypeImpl extends MinimalEObjectImpl.Container implements Wind
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public double getGValue() {
return gValue;
}
@@ -237,6 +256,7 @@ public class WindowTypeImpl extends MinimalEObjectImpl.Container implements Wind
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public void setGValue(double newGValue) {
double oldGValue = gValue;
gValue = newGValue;
@@ -250,6 +270,7 @@ public class WindowTypeImpl extends MinimalEObjectImpl.Container implements Wind
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public int getGlazingNumber() {
return glazingNumber;
}
@@ -259,6 +280,7 @@ public class WindowTypeImpl extends MinimalEObjectImpl.Container implements Wind
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public void setGlazingNumber(int newGlazingNumber) {
int oldGlazingNumber = glazingNumber;
glazingNumber = newGlazingNumber;
@@ -272,6 +294,7 @@ public class WindowTypeImpl extends MinimalEObjectImpl.Container implements Wind
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public int getFrameRatio() {
return frameRatio;
}
@@ -281,6 +304,7 @@ public class WindowTypeImpl extends MinimalEObjectImpl.Container implements Wind
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public void setFrameRatio(int newFrameRatio) {
int oldFrameRatio = frameRatio;
frameRatio = newFrameRatio;
diff --git a/de.hftstuttgart.buildingphysics/src-gen/de/hftstuttgart/buildingphysics/util/BuildingPhysicsAdapterFactory.java b/de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/util/BuildingPhysicsAdapterFactory.java
similarity index 100%
rename from de.hftstuttgart.buildingphysics/src-gen/de/hftstuttgart/buildingphysics/util/BuildingPhysicsAdapterFactory.java
rename to de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/util/BuildingPhysicsAdapterFactory.java
diff --git a/de.hftstuttgart.buildingphysics/src-gen/de/hftstuttgart/buildingphysics/util/BuildingPhysicsSwitch.java b/de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/util/BuildingPhysicsSwitch.java
similarity index 100%
rename from de.hftstuttgart.buildingphysics/src-gen/de/hftstuttgart/buildingphysics/util/BuildingPhysicsSwitch.java
rename to de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/util/BuildingPhysicsSwitch.java