At least JRE 1.6 is now required
Reapplied "override" annotation where necessary