Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Joda DateTime library and update to java.time package #575

Merged
merged 12 commits into from
Oct 29, 2021

Conversation

egouge
Copy link
Contributor

@egouge egouge commented Oct 22, 2021

Let me know if I need to do something more.

egouge and others added 8 commits October 21, 2021 16:09
Signed-off-by: Emily Gouge <egouge@refractions.net>
Signed-off-by: Emily Gouge <egouge@refractions.net>
Signed-off-by: Emily Gouge <egouge@refractions.net>
Signed-off-by: Emily Gouge <egouge@refractions.net>
Signed-off-by: Emily Gouge <egouge@refractions.net>
rather than org.joda.time.DataTime

Signed-off-by: Frank Gasdorf <fgdrf@users.sourceforge.net>
Update EMF-Model to LocalDateTime
Signed-off-by: Emily Gouge <egouge@refractions.net>
Copy link
Contributor

@fgdrf fgdrf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had a look and tried to remove DateTime elements completely. Independently from removing or keeping the elements, I cannot comile locally anymore. @egouge Hope you have more luck on this, however I'll try to setup a pairing session with @erdalkaraca who definitly has much more knowlege in the EMF field.

Signed-off-by: Emily Gouge <egouge@refractions.net>
Signed-off-by: Emily Gouge <egouge@refractions.net>
@egouge
Copy link
Contributor Author

egouge commented Oct 26, 2021

I was able to remove both timestep and elevation (and the date/time data type), regenerate the model and get it to compile.

@fgdrf
Copy link
Contributor

fgdrf commented Oct 27, 2021

I was able to remove both timestep and elevation (and the date/time data type), regenerate the model and get it to compile.

Awesome, this look promising. Could you please describe how you generated the code from the model? I assume you have Eclipse IDE with EMF Tooling installed (which version??)?

I'll try too re-run code generation with the current state of your branch and check how far I can get

Many thanks for your contribution!

@fgdrf
Copy link
Contributor

fgdrf commented Oct 27, 2021

Hmm, just wondering why the sphinx-build fails in github action while it was fine on previous commits (python and sphinx version are still the same):

     [exec] reading sources... [ 13%] concepts/World Plus Image

     [exec] Exception occurred:
     [exec]   File "/opt/hostedtoolcache/Python/3.10.0/x64/lib/python3.10/site-packages/sphinx/util/nodes.py", line 94, in apply_source_workaround
     [exec]     for classifier in reversed(node.parent.traverse(nodes.classifier)):
     [exec] TypeError: 'generator' object is not reversible
     [exec] The full traceback has been saved in /tmp/sphinx-err-s0ilrvu9.log, if you want to report the issue to the developers.
     [exec] Please also report this if it was a user error, so that a better error message can be provided next time.
     [exec] A bug report can be filed in the tracker at <https://github.com/sphinx-doc/sphinx/issues>. Thanks!

Signed-off-by: Emily Gouge <egouge@refractions.net>
Signed-off-by: Emily Gouge <egouge@refractions.net>
@egouge
Copy link
Contributor Author

egouge commented Oct 27, 2021

I tried to remove the old emf files and upgrade to new emf diagram files (replace .ecorediag with .aird files).
I also updated the sphinx version in the build file which seems to resolve the build issue.

In terms of how I re-generated the model:

  • I have EMF Framework SDK v2.27 installed
  • I opened the Project.genmodel file with 'EMF Generator' editor.
  • Right click on the 'Project' root node and select 'Generate All'.

@egouge
Copy link
Contributor Author

egouge commented Oct 28, 2021

@fgdrf Sorry if this is a silly question, I'm not sure with the process for merging pull request - Is merging this request something I am supposed to do?

@fgdrf
Copy link
Contributor

fgdrf commented Oct 29, 2021

Was just testing to start/restart application with projects & maps. Looks good, but spotted some other problems I created issues for:

@fgdrf fgdrf merged commit bfd630e into locationtech:master Oct 29, 2021
@fgdrf fgdrf added this to the 2.3.0 milestone Oct 29, 2021
@egouge egouge deleted the datetimeup branch October 29, 2021 15:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants