fix some bugs in Java generator
Merge branch 'master' of github.com:ffleurey/ThingML