Fixing eclipse warnings (javadoc and diamond operator)