From e393da6531fdb8c39717ea967f385c9aa5adc8bc Mon Sep 17 00:00:00 2001
From: Kai Brassel <mail@khbrassel.de>
Date: Sun, 14 Mar 2021 22:32:43 +0100
Subject: [PATCH] Custom conversion methods between String and Quantities were
missing
---
.../model/Quantities.genmodel | 4 +-
.../impl/QuantitiesFactoryImpl.java | 44 +++++++++++++++++--
2 files changed, 42 insertions(+), 6 deletions(-)
diff --git a/de.hftstuttgart.cityunits.model/model/Quantities.genmodel b/de.hftstuttgart.cityunits.model/model/Quantities.genmodel
index 2571119..d66e4a1 100644
--- a/de.hftstuttgart.cityunits.model/model/Quantities.genmodel
+++ b/de.hftstuttgart.cityunits.model/model/Quantities.genmodel
@@ -7,9 +7,9 @@
<foreignModel>Quantities.ecore</foreignModel>
<genPackages prefix="Quantities" basePackage="de.hftstuttgart.cityunits.model" disposableProviderFactory="true"
ecorePackage="Quantities.ecore#/">
- <genDataTypes ecoreDataType="Quantities.ecore#//QuantityDouble" create="return de.hftstuttgart.units.NullableQuantity.create(it);"
+ <genDataTypes ecoreDataType="Quantities.ecore#//QuantityDouble" create="return de.hftstuttgart.cityunits.model.NullableQuantity.create(it);"
convert="return it == null ? null : it.toString();"/>
- <genDataTypes ecoreDataType="Quantities.ecore#//QuantityLong" create="return de.hftstuttgart.units.NullableQuantity.create(it);"
+ <genDataTypes ecoreDataType="Quantities.ecore#//QuantityLong" create="return de.hftstuttgart.cityunits.model.NullableQuantity.create(it);"
convert="return it == null ? null : it.toString();"/>
</genPackages>
</genmodel:GenModel>
diff --git a/de.hftstuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/quantities/impl/QuantitiesFactoryImpl.java b/de.hftstuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/quantities/impl/QuantitiesFactoryImpl.java
index 9e3118e..d19f76b 100644
--- a/de.hftstuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/quantities/impl/QuantitiesFactoryImpl.java
+++ b/de.hftstuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/quantities/impl/QuantitiesFactoryImpl.java
@@ -97,13 +97,31 @@ public class QuantitiesFactoryImpl extends EFactoryImpl implements QuantitiesFac
}
}
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public NullableQuantity createQuantityDouble(final String it) {
+ return de.hftstuttgart.cityunits.model.NullableQuantity.create(it);
+ }
+
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
public NullableQuantity createQuantityDoubleFromString(EDataType eDataType, String initialValue) {
- return (NullableQuantity)super.createFromString(eDataType, initialValue);
+ return createQuantityDouble(initialValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public String convertQuantityDouble(final NullableQuantity it) {
+ return it == null ? null : it.toString();
}
/**
@@ -112,7 +130,16 @@ public class QuantitiesFactoryImpl extends EFactoryImpl implements QuantitiesFac
* @generated
*/
public String convertQuantityDoubleToString(EDataType eDataType, Object instanceValue) {
- return super.convertToString(eDataType, instanceValue);
+ return convertQuantityDouble((NullableQuantity)instanceValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public NullableQuantity createQuantityLong(final String it) {
+ return de.hftstuttgart.cityunits.model.NullableQuantity.create(it);
}
/**
@@ -121,7 +148,16 @@ public class QuantitiesFactoryImpl extends EFactoryImpl implements QuantitiesFac
* @generated
*/
public NullableQuantity createQuantityLongFromString(EDataType eDataType, String initialValue) {
- return (NullableQuantity)super.createFromString(eDataType, initialValue);
+ return createQuantityLong(initialValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public String convertQuantityLong(final NullableQuantity it) {
+ return it == null ? null : it.toString();
}
/**
@@ -130,7 +166,7 @@ public class QuantitiesFactoryImpl extends EFactoryImpl implements QuantitiesFac
* @generated
*/
public String convertQuantityLongToString(EDataType eDataType, Object instanceValue) {
- return super.convertToString(eDataType, instanceValue);
+ return convertQuantityLong((NullableQuantity)instanceValue);
}
/**
--
GitLab