Replaced custom unit projects by external cityunits and indriya plugins

de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/impl/ThermalStorageImpl.java

@@ -2,18 +2,22 @@
  */
 package de.hftstuttgart.energycomponents.impl;
 
-import de.hftstuttgart.energycomponents.EnCompFactory;
+import de.hftstuttgart.cityunits.model.NullableQuantity;
+
+import de.hftstuttgart.cityunits.model.quantities.QuantitiesFactory;
+import de.hftstuttgart.cityunits.model.quantities.QuantitiesPackage;
+
 import de.hftstuttgart.energycomponents.EnCompPackage;
 import de.hftstuttgart.energycomponents.Material;
 import de.hftstuttgart.energycomponents.Medium;
 import de.hftstuttgart.energycomponents.ThermalStorage;
 import de.hftstuttgart.energycomponents.ThermalStorageTypes;
 
-import de.hftstuttgart.units.NullableQuantity;
 import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
 
+import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
 /**
@@ -46,8 +50,8 @@ public class ThermalStorageImpl extends EnergyComponentImpl implements ThermalSt
 	 * @generated
 	 * @ordered
 	 */
-	protected static final NullableQuantity VOLUME_EDEFAULT = (NullableQuantity) EnCompFactory.eINSTANCE
-			.createFromString(EnCompPackage.eINSTANCE.getQuantityDouble(), "5 m\u00b3");
+	protected static final NullableQuantity VOLUME_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE
+			.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "5 m\u00b3");
 
 	/**
 	 * The cached value of the '{@link #getVolume() <em>Volume</em>}' attribute.
@@ -87,8 +91,8 @@ public class ThermalStorageImpl extends EnergyComponentImpl implements ThermalSt
 	 * @generated
 	 * @ordered
 	 */
-	protected static final NullableQuantity MAX_TEMP_EDEFAULT = (NullableQuantity) EnCompFactory.eINSTANCE
-			.createFromString(EnCompPackage.eINSTANCE.getQuantityDouble(), "80 \u00b0C");
+	protected static final NullableQuantity MAX_TEMP_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE
+			.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "80 \u00b0C");
 
 	/**
 	 * The cached value of the '{@link #getMaxTemp() <em>Max Temp</em>}' attribute.
@@ -108,8 +112,8 @@ public class ThermalStorageImpl extends EnergyComponentImpl implements ThermalSt
 	 * @generated
 	 * @ordered
 	 */
-	protected static final NullableQuantity TANK_THICKNESS_EDEFAULT = (NullableQuantity) EnCompFactory.eINSTANCE
-			.createFromString(EnCompPackage.eINSTANCE.getQuantityDouble(), "10 mm ");
+	protected static final NullableQuantity TANK_THICKNESS_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE
+			.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "10 mm ");
 
 	/**
 	 * The cached value of the '{@link #getTankThickness() <em>Tank Thickness</em>}' attribute.
@@ -129,8 +133,8 @@ public class ThermalStorageImpl extends EnergyComponentImpl implements ThermalSt
 	 * @generated
 	 * @ordered
 	 */
-	protected static final NullableQuantity INSULATION_THICKNESS_EDEFAULT = (NullableQuantity) EnCompFactory.eINSTANCE
-			.createFromString(EnCompPackage.eINSTANCE.getQuantityDouble(), "100 mm");
+	protected static final NullableQuantity INSULATION_THICKNESS_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE
+			.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "100 mm");
 
 	/**
 	 * The cached value of the '{@link #getInsulationThickness() <em>Insulation Thickness</em>}' attribute.
@@ -170,8 +174,8 @@ public class ThermalStorageImpl extends EnergyComponentImpl implements ThermalSt
 	 * @generated
 	 * @ordered
 	 */
-	protected static final NullableQuantity HEIGHT_EDEFAULT = (NullableQuantity) EnCompFactory.eINSTANCE
-			.createFromString(EnCompPackage.eINSTANCE.getQuantityDouble(), "2 m");
+	protected static final NullableQuantity HEIGHT_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE
+			.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "2 m");
 
 	/**
 	 * The cached value of the '{@link #getHeight() <em>Height</em>}' attribute.
@@ -524,7 +528,6 @@ public class ThermalStorageImpl extends EnergyComponentImpl implements ThermalSt
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {

de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/otherCost.java

-/**
- */
-package de.hftstuttgart.energycomponents;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>other Cost</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link de.hftstuttgart.energycomponents.otherCost#getAdministrationAndOtherCostShare <em>Administration And Other Cost Share</em>}</li>
- *   <li>{@link de.hftstuttgart.energycomponents.otherCost#getMaintenanceCostShare <em>Maintenance Cost Share</em>}</li>
- * </ul>
- *
- * @see de.hftstuttgart.energycomponents.EnCompPackage#getotherCost()
- * @model abstract="true"
- * @generated
- */
-public interface otherCost extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Administration And Other Cost Share</b></em>' attribute.
-	 * The default value is <code>"0.015"</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * share of investment cost
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Administration And Other Cost Share</em>' attribute.
-	 * @see #setAdministrationAndOtherCostShare(double)
-	 * @see de.hftstuttgart.energycomponents.EnCompPackage#getotherCost_AdministrationAndOtherCostShare()
-	 * @model default="0.015"
-	 * @generated
-	 */
-	double getAdministrationAndOtherCostShare();
-
-	/**
-	 * Sets the value of the '{@link de.hftstuttgart.energycomponents.otherCost#getAdministrationAndOtherCostShare <em>Administration And Other Cost Share</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Administration And Other Cost Share</em>' attribute.
-	 * @see #getAdministrationAndOtherCostShare()
-	 * @generated
-	 */
-	void setAdministrationAndOtherCostShare(double value);
-
-	/**
-	 * Returns the value of the '<em><b>Maintenance Cost Share</b></em>' attribute.
-	 * The default value is <code>"0.015"</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * share of investment cost
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Maintenance Cost Share</em>' attribute.
-	 * @see #setMaintenanceCostShare(double)
-	 * @see de.hftstuttgart.energycomponents.EnCompPackage#getotherCost_MaintenanceCostShare()
-	 * @model default="0.015"
-	 * @generated
-	 */
-	double getMaintenanceCostShare();
-
-	/**
-	 * Sets the value of the '{@link de.hftstuttgart.energycomponents.otherCost#getMaintenanceCostShare <em>Maintenance Cost Share</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Maintenance Cost Share</em>' attribute.
-	 * @see #getMaintenanceCostShare()
-	 * @generated
-	 */
-	void setMaintenanceCostShare(double value);
-
-} // otherCost

de.hftstuttgart.energycomponents.target/.project

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>de.hftstuttgart.energycomponents.target</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>

de.hftstuttgart.energycomponents.target/energycomponents.target.target

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+<target name="RCP, EMF Forms 2020-12, JRE">
+	<locations>
+		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
+			<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_101/"/>
+			<unit id="de.hftstuttgart.cityunits.feature.feature.group" version="0.0.0"/>
+		</location>
+		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
+			<repository location="https://download.eclipse.org/justj/jres/15/updates/milestone"/>
+			<unit id="org.eclipse.justj.openjdk.hotspot.jre.full.stripped.feature.group" version="15.0.2.v20210201-0955"/>
+		</location>
+	</locations>
+</target>
\ No newline at end of file

de.hftstuttgart.indriya.osgiplugin/.classpath

-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
-		<attributes>
-			<attribute name="module" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry exported="true" kind="lib" path="indriya-2.0.2.jar" sourcepath="indriya-2.0.2-sources.jar"/>
-	<!-- classpathentry exported="true" kind="lib" path="javax.inject-1.jar"/-->
-	<classpathentry exported="true" kind="lib" path="unit-api-2.0.jar" sourcepath="unit-api-2.0-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="uom-lib-common-2.0.jar" sourcepath="uom-lib-common-2.0-sources.jar">
-		<attributes>
-			<attribute name="javadoc_location" value="jar:platform:/resource/de.hftstuttgart.units.libs/uom-lib-common-2.0-javadoc.jar!/"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

de.hftstuttgart.indriya.osgiplugin/.gitignore

-*.jar
-!indriya*.jar
-!javax.inject*.jar
-!unit-api*.jar
-!uom-lib-common*.jar

de.hftstuttgart.indriya.osgiplugin/.project

-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>de.hftstuttgart.indriya.osgiplugin</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

de.hftstuttgart.indriya.osgiplugin/META-INF/MANIFEST.MF

-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: de.hftstuttgart.units.libs
-Bundle-SymbolicName: de.hftstuttgart.indriya.osgiplugin
-Bundle-Version: 1.0.0
-Bundle-ClassPath: indriya-2.0.2-javadoc.jar,
- indriya-2.0.2-sources.jar,
- indriya-2.0.2.jar,
- unit-api-2.0-javadoc.jar,
- unit-api-2.0-sources.jar,
- unit-api-2.0.jar,
- uom-lib-common-2.0-javadoc.jar,
- uom-lib-common-2.0-sources.jar,
- uom-lib-common-2.0.jar
-Export-Package: javax.measure,
- javax.measure.format,
- javax.measure.quantity,
- javax.measure.spi,
- tech.units.indriya,
- tech.units.indriya.format,
- tech.units.indriya.function,
- tech.units.indriya.internal.format,
- tech.units.indriya.internal.format.l10n,
- tech.units.indriya.internal.function.calc,
- tech.units.indriya.internal.function.radix,
- tech.units.indriya.internal.function.simplify,
- tech.units.indriya.quantity,
- tech.units.indriya.quantity.time,
- tech.units.indriya.spi,
- tech.units.indriya.unit,
- tech.uom.lib.common.function,
- tech.uom.lib.common.util
-Automatic-Module-Name: de.hftstuttgart.units.libs

de.hftstuttgart.indriya.osgiplugin/build.properties

-bin.includes = META-INF/,\
-               indriya-2.0.2.jar,\
-               unit-api-2.0.jar,\
-               uom-lib-common-2.0.jar

de.hftstuttgart.units.ui.renderer/.classpath

-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
-		<attributes>
-			<attribute name="module" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

de.hftstuttgart.units.ui.renderer/.project

-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>de.hftstuttgart.units.ui.renderer</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ds.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>