more java wayland server refactoring