Fix some errors in Java generators
Merge branch 'master' of https://github.com/exbluesbreaker/csu-code-analysis.git