Commit 9b2e2dff authored by Kai-Holger Brassel's avatar Kai-Holger Brassel
Browse files

Code for conversion TimeOfDay from String was lost; Use Java 17

parent 1dac17df
Pipeline #6106 passed with stage
in 7 minutes and 43 seconds
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-16"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/"/> <classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/> <classpathentry kind="output" path="target/classes"/>
</classpath> </classpath>
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-16"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
<attributes> <attributes>
<attribute name="module" value="true"/> <attribute name="module" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/"/> <classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/> <classpathentry kind="output" path="target/classes"/>
</classpath> </classpath>
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel"
modelDirectory="/de.hftstuttgart.cityunits.model/src" creationIcons="false" modelDirectory="/de.hftstuttgart.cityunits.model/src" creationIcons="false"
modelPluginID="de.hftstuttgart.cityunits.model" modelName="Quantities" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" modelPluginID="de.hftstuttgart.cityunits.model" modelName="Quantities" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
importerID="org.eclipse.emf.importer.ecore" complianceLevel="11.0" copyrightFields="false" importerID="org.eclipse.emf.importer.ecore" complianceLevel="17.0" copyrightFields="false"
importOrganizing="true"> importOrganizing="true">
<foreignModel>Quantities.ecore</foreignModel> <foreignModel>Quantities.ecore</foreignModel>
<genPackages prefix="Quantities" basePackage="de.hftstuttgart.cityunits.model" disposableProviderFactory="true" <genPackages prefix="Quantities" basePackage="de.hftstuttgart.cityunits.model" disposableProviderFactory="true"
ecorePackage="Quantities.ecore#/"> ecorePackage="Quantities.ecore#/">
<genDataTypes ecoreDataType="Quantities.ecore#//Quantity" create="return de.hftstuttgart.cityunits.model.NullableQuantity.create(it);"/> <genDataTypes ecoreDataType="Quantities.ecore#//Quantity" create="return de.hftstuttgart.cityunits.model.NullableQuantity.create(it);"/>
<genDataTypes ecoreDataType="Quantities.ecore#//TimeOfDay"/> <genDataTypes ecoreDataType="Quantities.ecore#//TimeOfDay" create="return java.time.LocalTime.parse(it);"/>
</genPackages> </genPackages>
</genmodel:GenModel> </genmodel:GenModel>
...@@ -125,13 +125,22 @@ public class QuantitiesFactoryImpl extends EFactoryImpl implements QuantitiesFac ...@@ -125,13 +125,22 @@ public class QuantitiesFactoryImpl extends EFactoryImpl implements QuantitiesFac
return super.convertToString(eDataType, instanceValue); return super.convertToString(eDataType, instanceValue);
} }
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
public LocalTime createTimeOfDay(final String it) {
return java.time.LocalTime.parse(it);
}
/** /**
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @generated * @generated
*/ */
public LocalTime createTimeOfDayFromString(EDataType eDataType, String initialValue) { public LocalTime createTimeOfDayFromString(EDataType eDataType, String initialValue) {
return (LocalTime)super.createFromString(eDataType, initialValue); return createTimeOfDay(initialValue);
} }
/** /**
......
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
<artifactId>tycho-maven-plugin</artifactId> <artifactId>tycho-maven-plugin</artifactId>
<version>${tycho-version}</version> <version>${tycho-version}</version>
<configuration> <configuration>
<source>16</source> <source>17</source>
<target>16</target> <target>17</target>
<encoding>UTF-8</encoding> <encoding>UTF-8</encoding>
</configuration> </configuration>
<extensions>true</extensions> <extensions>true</extensions>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment