Upgrade to Java 1.7

Signed-off-by: Ferry Huberts <f.huberts@mindef.nl>
Remove 'Redundant tpye specification' warnings

Signed-off-by: Ferry Huberts <f.huberts@mindef.nl>