Adopt workshop presentation
Adopt code generator: use only java 6 syntax