Added Java 1.5 Override annotations where required


This change adds the Override annotations where required and possible.