Project setup

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>

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>

de.hftstuttgart.buildingphysics.target/buildingphysics.target.target

 <?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

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"

de.hftstuttgart.buildingphysics/.classpath

 <?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>

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

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/

de.hftstuttgart.buildingphysics/model/buildingphysics.genmodel

 <?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"/>

de.hftstuttgart.buildingphysics/src-gen/de/hftstuttgart/buildingphysics/WindowType.java → 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

de.hftstuttgart.buildingphysics/src-gen/de/hftstuttgart/buildingphysics/impl/BuildingPhysicsCatalogImpl.java → 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) {