[Java] Fix bug in generator, const was missing for reference to Suite.
[Java] Continue preparation of Makefile generation.
[Java] Code cleanup.