diff --git a/de.hftstuttgart.cityunits.model.edit/.classpath b/de.hftstuttgart.cityunits.model.edit/.classpath index b405857762d046f304557814e3acb25a3c08bdc2..fe1a205326e790e93e29a1f7efc6e59525001154 100644 --- a/de.hftstuttgart.cityunits.model.edit/.classpath +++ b/de.hftstuttgart.cityunits.model.edit/.classpath @@ -1,7 +1,11 @@ <?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/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="src" path="src/"/> + <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="target/classes"/> </classpath> diff --git a/de.hftstuttgart.cityunits.model/.classpath b/de.hftstuttgart.cityunits.model/.classpath index 24b87a36150fa89dd6128f70e6097f936c1a716d..fe1a205326e790e93e29a1f7efc6e59525001154 100644 --- a/de.hftstuttgart.cityunits.model/.classpath +++ b/de.hftstuttgart.cityunits.model/.classpath @@ -1,11 +1,11 @@ <?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/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="src" path="src/"/> + <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="target/classes"/> </classpath> diff --git a/de.hftstuttgart.cityunits.model/model/Quantities.genmodel b/de.hftstuttgart.cityunits.model/model/Quantities.genmodel index eeba660093ab21e3c13d5441dd63ee591e1d3ce1..7c147bf5d75f1a09e7622af92b1b637af0116138 100644 --- a/de.hftstuttgart.cityunits.model/model/Quantities.genmodel +++ b/de.hftstuttgart.cityunits.model/model/Quantities.genmodel @@ -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" modelDirectory="/de.hftstuttgart.cityunits.model/src" creationIcons="false" 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"> <foreignModel>Quantities.ecore</foreignModel> <genPackages prefix="Quantities" basePackage="de.hftstuttgart.cityunits.model" disposableProviderFactory="true" ecorePackage="Quantities.ecore#/"> <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> </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 82031e8180d85a1459a4041caef619779a5e2b1e..f2b2567bb8fa2d2a5f1e0f3715e8a655a9e64fe2 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 @@ -125,13 +125,22 @@ public class QuantitiesFactoryImpl extends EFactoryImpl implements QuantitiesFac 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 --> * <!-- end-user-doc --> * @generated */ public LocalTime createTimeOfDayFromString(EDataType eDataType, String initialValue) { - return (LocalTime)super.createFromString(eDataType, initialValue); + return createTimeOfDay(initialValue); } /** diff --git a/pom.xml b/pom.xml index f56b22fa6333884a48dda3f1949b474401544af2..6723fb6d2004f80fdb32fc2a5dd12c4ef60efbc9 100644 --- a/pom.xml +++ b/pom.xml @@ -19,8 +19,8 @@ <artifactId>tycho-maven-plugin</artifactId> <version>${tycho-version}</version> <configuration> - <source>16</source> - <target>16</target> + <source>17</source> + <target>17</target> <encoding>UTF-8</encoding> </configuration> <extensions>true</extensions>