Revert incorrectly removed @Override Annotations

The @Override annotations were being incorrectly reported by Eclipse as being in error. Not sure why, but putting them back.