[*] adaptation for vaadin 7